diff --git a/.github/workflows/sync-to-forgejo.yml b/.github/workflows/sync-to-forgejo.yml index 0476de5..6154d64 100644 --- a/.github/workflows/sync-to-forgejo.yml +++ b/.github/workflows/sync-to-forgejo.yml @@ -19,8 +19,9 @@ jobs: - name: Sync to Forgejo env: - FORGEJO_TOKEN: ${{ secrets.FORGEJO_SECRET || secrets.GITEA_SECRET }} - FORGEJO_OWNER: ${{ secrets.FORGEJO_OWNER || secrets.FORGEJO_USERNAME || secrets.GITEA_USERNAME || 'ashwin' }} + FORGEJO_SECRET: ${{ secrets.FORGEJO_SECRET || secrets.GITEA_SECRET }} + FORGEJO_OWNER: ${{ secrets.FORGEJO_OWNER || 'ashwin' }} + FORGEJO_USERNAME: ${{ secrets.FORGEJO_USERNAME || secrets.GITEA_USERNAME || 'ashwin' }} REPO: ${{ github.event.repository.name }} BRANCH: ${{ github.ref_name }} run: | @@ -29,12 +30,12 @@ jobs: export GIT_TRACE=1 export GIT_CURL_VERBOSE=1 - USER="${FORGEJO_OWNER}" + USER="${FORGEJO_USERNAME}" TARGET="https://ci.nxtgauge.com/${FORGEJO_OWNER}/${REPO}.git" - AUTH="$(printf '%s' "${USER}:${FORGEJO_TOKEN}" | base64 -w0)" + AUTH="$(printf '%s' "${USER}:${FORGEJO_SECRET}" | base64 -w0)" - test -n "${FORGEJO_TOKEN:-}" || (echo "FORGEJO_TOKEN empty" && exit 1) - curl -fsS -H "Authorization: token ${FORGEJO_TOKEN}" https://ci.nxtgauge.com/api/v1/user >/dev/null + test -n "${FORGEJO_SECRET:-}" || (echo "FORGEJO_SECRET empty" && exit 1) + curl -fsS -H "Authorization: Basic ${AUTH}" https://ci.nxtgauge.com/api/v1/user >/dev/null curl -fsS -H "Authorization: Basic ${AUTH}" "${TARGET}/info/refs?service=git-receive-pack" >/dev/null git config user.name "github-actions[bot]"