feat: update workflows to use GH_TOKEN references

BarkinKctp · BarkinKctp · commit df17e17cc293 · 2026-03-14T19:18:46.000+03:00
diff --git a/.github/workflows/build-citus-community-nightlies.yml b/.github/workflows/build-citus-community-nightlies.yml
@@ -44,6 +44,12 @@ jobs:
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: ${{ github.repository_owner }}
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
@@ -60,9 +66,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Clone build branch
-        env:
-          GH_TOKEN: ${{ steps.app.outputs.token }}
-        run: git clone -b "${MAIN_BRANCH}" --depth=1 https://${GH_TOKEN}@github.com/citusdata/packaging.git packaging
+        run: git clone -b "${MAIN_BRANCH}" --depth=1 https://github.com/citusdata/packaging.git packaging
 
       - name: Install package dependencies
         run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources
diff --git a/.github/workflows/citus-package-all-platforms-test.yml b/.github/workflows/citus-package-all-platforms-test.yml
@@ -45,6 +45,12 @@ jobs:
           app-id: ${{ vars.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_KEY }}
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml
@@ -30,13 +30,20 @@ jobs:
           app-id: ${{ vars.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: citusdata
+
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
           token: ${{ steps.app.outputs.token }}
           fetch-depth: 2
           submodules: true
-          
+
       - name: Package version
         id: get-citus-version
         run: |
diff --git a/.github/workflows/packaging-methods-tests.yml b/.github/workflows/packaging-methods-tests.yml
@@ -23,6 +23,12 @@ jobs:
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: citusdata
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/publish-docker-image-tests.yml b/.github/workflows/publish-docker-image-tests.yml
@@ -24,6 +24,12 @@ jobs:
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: citusdata
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/statistic-schedule.yml b/.github/workflows/statistic-schedule.yml
@@ -36,6 +36,12 @@ jobs:
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: citusdata
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/statistic-tests.yml b/.github/workflows/statistic-tests.yml
@@ -31,6 +31,12 @@ jobs:
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: citusdata
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/tool-tests.yml b/.github/workflows/tool-tests.yml
@@ -37,6 +37,12 @@ jobs:
           private-key: ${{ secrets.GH_APP_KEY }}
           owner: citusdata
 
+      - name: Setup git authentication for GitHub App
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+        run: |
+          git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
diff --git a/packaging_automation/common_tool_methods.py b/packaging_automation/common_tool_methods.py
@@ -681,7 +681,7 @@ def initialize_env(exec_path: str, project_name: str, checkout_dir: str):
     remove_cloned_code(f"{exec_path}/{checkout_dir}")
     if not os.path.exists(checkout_dir):
         GH_TOKEN = os.environ.get("GH_TOKEN", "")
-        run(f"git clone https://{GH_TOKEN}@github.com/citusdata/{project_name}.git {checkout_dir}")
+        run(f"git clone https://github.com/citusdata/{project_name}.git {checkout_dir}")
 
 
 def create_pr(
diff --git a/packaging_automation/tests/test_citus_package.py b/packaging_automation/tests/test_citus_package.py
@@ -86,11 +86,8 @@ def setup_module():
         "pgxn-citus" if PLATFORM == "pgxn" else PACKAGING_BRANCH_NAME
     )
     if not os.path.exists(PACKAGING_EXEC_FOLDER):
-        GH_TOKEN = os.environ.get("GH_TOKEN", "")
-        if not GH_TOKEN:
-            raise ValueError("GH_TOKEN environment variable is not set.")
         run(
-            f"git clone --branch {packaging_branch_name} https://{GH_TOKEN}@github.com/citusdata/packaging.git {PACKAGING_EXEC_FOLDER}"
+            f"git clone --branch {packaging_branch_name} https://github.com/citusdata/packaging.git {PACKAGING_EXEC_FOLDER}"
         )
 
 
diff --git a/packaging_automation/tests/test_citus_package_utils.py b/packaging_automation/tests/test_citus_package_utils.py
@@ -45,11 +45,8 @@
 
 def setup_module():
     if not os.path.exists("packaging_test"):
-        GH_TOKEN = os.environ.get("GH_TOKEN", "")
-        if not GH_TOKEN:
-            raise ValueError("GH_TOKEN environment variable is not set.")
         run(
-            f"git clone --branch all-citus-unit-tests https://{GH_TOKEN}@github.com/citusdata/packaging.git {PACKAGING_SOURCE_FOLDER}"
+            f"git clone --branch all-citus-unit-tests https://github.com/citusdata/packaging.git {PACKAGING_SOURCE_FOLDER}"
         )
 
 
diff --git a/packaging_automation/tests/test_prepare_release.py b/packaging_automation/tests/test_prepare_release.py
@@ -41,7 +41,7 @@ def initialize_env() -> str:
     remove_cloned_code(test_base_path_major)
     if not os.path.exists(test_base_path_major):
         GH_TOKEN = os.getenv("GH_TOKEN", "")
-        run(f"git clone https://{GH_TOKEN}@github.com/citusdata/citus.git {test_base_path_major}")
+        run(f"git clone https://github.com/citusdata/citus.git {test_base_path_major}")
     return test_base_path_major
 
 
diff --git a/packaging_automation/tests/test_publish_docker.py b/packaging_automation/tests/test_publish_docker.py
@@ -30,7 +30,7 @@
 def initialize_env():
     if not os.path.exists("docker"):
         GH_TOKEN = os.getenv("GH_TOKEN", "")
-        run(f"git clone https://{GH_TOKEN}@github.com/citusdata/docker.git")
+        run(f"git clone https://github.com/citusdata/docker.git")
 
 
 def test_decode_triggering_event_info():
diff --git a/packaging_automation/tests/test_update_docker.py b/packaging_automation/tests/test_update_docker.py
@@ -34,10 +34,7 @@
 
 def setup_module():
     if not os.path.exists("docker"):
-        GH_TOKEN = os.getenv("GH_TOKEN", "")
-        if not GH_TOKEN:
-            raise ValueError("GH_TOKEN environment variable is not set.")
-        run(f"git clone https://{GH_TOKEN}@github.com/citusdata/docker.git")
+        run(f"git clone https://github.com/citusdata/docker.git")
 
 
 def teardown_module():
diff --git a/packaging_automation/tests/test_update_pgxn.py b/packaging_automation/tests/test_update_pgxn.py
@@ -18,11 +18,8 @@
 
 def setup_module():
     if not os.path.exists("packaging_test"):
-        GH_TOKEN = os.environ.get("GH_TOKEN", "")
-        if not GH_TOKEN:
-            raise ValueError("GH_TOKEN environment variable is not set.")
         run(
-            f"git clone --branch pgxn-citus https://{GH_TOKEN}@github.com/citusdata/packaging.git packaging_test"
+            f"git clone --branch pgxn-citus https://github.com/citusdata/packaging.git packaging_test"
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,8 @@ def setup_module():`
`86`	`86`	`"pgxn-citus" if PLATFORM == "pgxn" else PACKAGING_BRANCH_NAME`
`87`	`87`	`)`
`88`	`88`	`if not os.path.exists(PACKAGING_EXEC_FOLDER):`
`89`		`- GH_TOKEN = os.environ.get("GH_TOKEN", "")`
`90`		`- if not GH_TOKEN:`
`91`		`- raise ValueError("GH_TOKEN environment variable is not set.")`
`92`	`89`	`run(`
`93`		`- f"git clone --branch {packaging_branch_name} https://{GH_TOKEN}@github.com/citusdata/packaging.git {PACKAGING_EXEC_FOLDER}"`
	`90`	`+ f"git clone --branch {packaging_branch_name} https://github.com/citusdata/packaging.git {PACKAGING_EXEC_FOLDER}"`
`94`	`91`	`)`
`95`	`92`
`96`	`93`