Revert Changes

Author: BarkinKctp

.github/workflows/build-package-test.yml

@@ -101,13 +101,11 @@ jobs:
           python -m pytest -q tools/packaging_automation/tests/test_citus_package.py -k 'test_build_packages'
         env:
           PACKAGING_IMAGE_PLATFORM: "${{matrix.TARGET_PLATFORM}}"
-          GH_TOKEN: ${{ steps.app.outputs.token }}
 
       - name: Push images
         run: |
           export CURRENT_BRANCH=${GITHUB_REF##*/}
           ./ci/push_images
         env:
           TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }}
-          POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }}
-          GH_TOKEN: ${{ steps.app.outputs.token }}
+          POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }}

.github/workflows/build-package.yml

@@ -107,4 +107,3 @@ jobs:
         env:
           TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }}
           POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }}
-          GH_TOKEN: ${{ steps.app.outputs.token }}

.github/workflows/image-health-check.yml

@@ -27,24 +27,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Create GitHub App token
-        id: app
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_KEY }}
-          owner: ${{ github.repository_owner }}
-
-      - name: Set GH_TOKEN for all steps
-        run: echo "GH_TOKEN=${{ steps.app.outputs.token }}" >> $GITHUB_ENV
-
       - name: Check out repository
         uses: actions/checkout@v6
-        with:
-          token: ${{ steps.app.outputs.token }}
-
-      - name: Configure git with x-access-token
-        run: git config --global url."https://x-access-token:${{ steps.app.outputs.token }}@github.com/".insteadOf "https://github.com/"
 
       - name: Update and check dockerfiles
         run: |
@@ -111,7 +95,6 @@ jobs:
           TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }}
           POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }}
 
-
       - name: Clone tools repo for test
         run: git clone -b v0.8.35 --depth=1  https://github.com/citusdata/tools.git tools
 

.github/workflows/update_package_properties.yml

@@ -18,24 +18,9 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - name: Create GitHub App token
-        id: app
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_KEY }}
-          owner: ${{ github.repository_owner }}
-
-      - name: Set GH_TOKEN for all steps
-        run: echo "GH_TOKEN=${{ steps.app.outputs.token }}" >> $GITHUB_ENV
 
       - name: Checkout repository
         uses: actions/checkout@v6
-        with:
-          token: ${{ steps.app.outputs.token }}
-
-      - name: Configure git with x-access-token
-        run: git config --global url."https://x-access-token:${{ steps.app.outputs.token }}@github.com/".insteadOf "https://github.com/"
 
       # Runs a single command using the runners shell
       - name: Clone Tools branch

build_packages

@@ -17,15 +17,7 @@ fi
 project=$1
 buildtype=$2
 
-if [ -z "${GH_TOKEN:-}" ]; then
-    echo "$0: GH_TOKEN (GitHub App token) is required but not set" >&2
-    exit 66
-fi
-
-echo "header=\"Authorization: Bearer ${GH_TOKEN}\"" > ~/.curlrc
-
-# ensuring GH_TOKEN usage for clones/fetches
-git config --global url."https://x-access-token:${GH_TOKEN}@github.com/".insteadOf "https://github.com/"
+git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 
 name=$(git config --get user.name)
 email=$(git config --get user.email)
@@ -62,7 +54,7 @@ while read -r line; do
             continue
         fi
         args+="run --rm -v ${outputdir}:/packages -v ${buildfilesdir}/deb:/buildfiles:ro "
-        args+="-e GH_TOKEN=${GH_TOKEN} -e DEBFULLNAME='${name}' -e DEBEMAIL='${email}' "
+        args+="-e GITHUB_TOKEN=${GITHUB_TOKEN} -e DEBFULLNAME='${name}' -e DEBEMAIL='${email}' "
         args+="citusdata/packaging:${os}-${release}-all $buildtype\n"
     elif [[ "${os}" = 'centos' ]] || [[ "${os}" = 'fedora' ]] || [[ "${os}" = 'oraclelinux' ]]; then
         # shellcheck source=/dev/null
@@ -88,13 +80,13 @@ while read -r line; do
             fi
             pgshort=${pgversion//./}
             args+="run --rm -v ${outputdir}:/packages -v ${buildfilesdir}/rpm:/buildfiles:ro "
-            args+="-e GH_TOKEN=${GH_TOKEN} -e RPM_PACKAGER='${packager}' "
+            args+="-e GITHUB_TOKEN=${GITHUB_TOKEN} -e RPM_PACKAGER='${packager}' "
             args+="citusdata/packaging:${os}-${release}-pg${pgshort} $buildtype\n"
         done
     elif [[ "${os}" = 'pgxn' ]]; then
         if [[ "${project}" = 'citus' ]] && [[ "${buildtype}" = 'release' ]]; then
             args+="run --rm -v ${outputdir}:/packages -v ${buildfilesdir}/pgxn:/buildfiles:ro "
-            args+="-e GH_TOKEN=${GH_TOKEN} citusdata/packaging:${os}-all $buildtype\n"
+            args+="-e GITHUB_TOKEN=${GITHUB_TOKEN} citusdata/packaging:${os}-all $buildtype\n"
         else
             echo "skipping PGXN... unsupported for this build" >&2
         fi

scripts/fetch_and_build_deb

@@ -88,19 +88,7 @@ if [ -z "${pkglatest}" ]; then
     exit $noinput
 fi
 
-# normalize token name (accept GH_TOKEN from CI) and fail fast — we only use installation tokens
-if [ -n "${GH_TOKEN:-}" ] && [ -z "${GITHUB_TOKEN:-}" ]; then
-    export GITHUB_TOKEN="${GH_TOKEN}"
-fi
-
-if [ -z "${GITHUB_TOKEN:-}" ]; then
-    echo "$0: error: GITHUB_TOKEN (installation token) is required" >&2
-    exit $noinput
-fi
-
-# use installation token for curl and git; keep token file permission-restricted
-printf 'header="Authorization: token %s"\n' "${GITHUB_TOKEN}" > ~/.curlrc
-chmod 600 ~/.curlrc
+echo "header=\"Authorization: Bearer ${GITHUB_TOKEN}\"" > ~/.curlrc
 git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 
 export NAME

scripts/fetch_and_build_pgxn

@@ -50,19 +50,7 @@ if [ -z "${pkglatest}" ]; then
     exit $noinput
 fi
 
-# normalize token name (accept GH_TOKEN from CI) and fail fast — we only use installation tokens
-if [ -n "${GH_TOKEN:-}" ] && [ -z "${GITHUB_TOKEN:-}" ]; then
-    export GITHUB_TOKEN="${GH_TOKEN}"
-fi
-
-if [ -z "${GITHUB_TOKEN:-}" ]; then
-    echo "$0: error: GITHUB_TOKEN (installation token) is required" >&2
-    exit $noinput
-fi
-
-# use installation token for curl and git; keep token file permission-restricted
-printf 'header="Authorization: token %s"\n' "${GITHUB_TOKEN}" > ~/.curlrc
-chmod 600 ~/.curlrc
+echo "header=\"Authorization: Bearer ${GITHUB_TOKEN}\"" > ~/.curlrc
 git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 
 cp -R /buildfiles/META.json "${builddir}"

scripts/fetch_and_build_rpm

@@ -81,19 +81,7 @@ if [ -z "${pkglatest}" ]; then
     exit $noinput
 fi
 
-# normalize token name (accept GH_TOKEN from CI) and fail fast — we only use installation tokens
-if [ -n "${GH_TOKEN:-}" ] && [ -z "${GITHUB_TOKEN:-}" ]; then
-    export GITHUB_TOKEN="${GH_TOKEN}"
-fi
-
-if [ -z "${GITHUB_TOKEN:-}" ]; then
-    echo "$0: error: GITHUB_TOKEN (installation token) is required" >&2
-    exit $noinput
-fi
-
-# use installation token for curl and git; keep token file permission-restricted
-printf 'header="Authorization: token %s"\n' "${GITHUB_TOKEN}" > ~/.curlrc
-chmod 600 ~/.curlrc
+echo "header=\"Authorization: Bearer ${GITHUB_TOKEN}\"" > ~/.curlrc
 git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 
 name=$(determine_name)