From 7ea8313fc2c8774b7904a970426f44c5a8defbcc Mon Sep 17 00:00:00 2001 From: Brendon Smith Date: Sun, 9 Jun 2024 20:08:19 -0400 Subject: [PATCH] Check repo ID instead of repo owner ID --- action.yml | 8 ++++---- create-docker-action.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/action.yml b/action.yml index 76e8eb6..7320b86 100644 --- a/action.yml +++ b/action.yml @@ -113,17 +113,17 @@ runs: # https://github.com/actions/runner/issues/2473 REF=${{ env.ACTION_REF || env.PR_REF || github.ref_name }} REPO=${{ env.ACTION_REPO || env.PR_REPO || github.repository }} - REPO_OWNER_ID=${{ env.PR_REPO_OWNER_ID || github.repository_owner_id }} + REPO_ID=${{ env.PR_REPO_ID || github.repository_id }} echo "ref=$REF" >>"$GITHUB_OUTPUT" echo "repo=$REPO" >>"$GITHUB_OUTPUT" - echo "repo-owner-id=$REPO_OWNER_ID" >>"$GITHUB_OUTPUT" + echo "repo-id=$REPO_ID" >>"$GITHUB_OUTPUT" shell: bash env: ACTION_REF: ${{ github.action_ref }} ACTION_REPO: ${{ github.action_repository }} PR_REF: ${{ github.event.pull_request.head.ref }} PR_REPO: ${{ github.event.pull_request.head.repo.full_name }} - PR_REPO_OWNER_ID: ${{ github.event.pull_request.base.repo.owner.id }} + PR_REPO_ID: ${{ github.event.pull_request.base.repo.id }} - name: Check out action repo uses: actions/checkout@v4 with: @@ -138,7 +138,7 @@ runs: EVENT: ${{ github.event_name }} REF: ${{ steps.set-repo-and-ref.outputs.ref }} REPO: ${{ steps.set-repo-and-ref.outputs.repo }} - REPO_OWNER_ID: ${{ steps.set-repo-and-ref.outputs.repo-owner-id }} + REPO_ID: ${{ steps.set-repo-and-ref.outputs.repo-id }} shell: bash working-directory: action-repo - name: Run Docker container diff --git a/create-docker-action.py b/create-docker-action.py index a51d27d..86adb19 100644 --- a/create-docker-action.py +++ b/create-docker-action.py @@ -8,18 +8,18 @@ REQUIRED = 'required' EVENT = os.environ['EVENT'] REF = os.environ['REF'] REPO = os.environ['REPO'] -REPO_OWNER_ID = os.environ['REPO_OWNER_ID'] -REPO_OWNER_ID_PYPA = '647025' +REPO_ID = os.environ['REPO_ID'] +REPO_ID_GH_ACTION = '178055147' -def set_image(event: str, ref: str, repo: str, repo_owner_id: str) -> str: - if event == 'pull_request' and repo_owner_id == REPO_OWNER_ID_PYPA: +def set_image(event: str, ref: str, repo: str, repo_id: str) -> str: + if event == 'pull_request' and repo_id == REPO_ID_GH_ACTION: return '../../../Dockerfile' docker_ref = ref.replace('/', '-') return f'docker://ghcr.io/{repo}:{docker_ref}' -image = set_image(EVENT, REF, REPO, REPO_OWNER_ID) +image = set_image(EVENT, REF, REPO, REPO_ID) action = { 'name': '🏃',