actions
/
gh-action-pypi-publish
Template
mirror of https://github.com/pypa/gh-action-pypi-publish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check repo ID instead of repo owner ID

This commit is contained in:
Brendon Smith 2024-06-09 20:08:19 -04:00
parent f51682fb52
commit 7ea8313fc2
No known key found for this signature in database
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
action.yml
View File

@ -113,17 +113,17 @@ runs:
# https://github.com/actions/runner/issues/2473 # https://github.com/actions/runner/issues/2473
REF=${{ env.ACTION_REF || env.PR_REF || github.ref_name }} REF=${{ env.ACTION_REF || env.PR_REF || github.ref_name }}
REPO=${{ env.ACTION_REPO || env.PR_REPO || github.repository }} 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 "ref=$REF" >>"$GITHUB_OUTPUT"
echo "repo=$REPO" >>"$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 shell: bash
env: env:
ACTION_REF: ${{ github.action_ref }} ACTION_REF: ${{ github.action_ref }}
ACTION_REPO: ${{ github.action_repository }} ACTION_REPO: ${{ github.action_repository }}
PR_REF: ${{ github.event.pull_request.head.ref }} PR_REF: ${{ github.event.pull_request.head.ref }}
PR_REPO: ${{ github.event.pull_request.head.repo.full_name }} 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 - name: Check out action repo
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@ -138,7 +138,7 @@ runs:
EVENT: ${{ github.event_name }} EVENT: ${{ github.event_name }}
REF: ${{ steps.set-repo-and-ref.outputs.ref }} REF: ${{ steps.set-repo-and-ref.outputs.ref }}
REPO: ${{ steps.set-repo-and-ref.outputs.repo }} 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 shell: bash
working-directory: action-repo working-directory: action-repo
- name: Run Docker container - name: Run Docker container

10
create-docker-action.py
View File

@ -8,18 +8,18 @@ REQUIRED = 'required'
EVENT = os.environ['EVENT'] EVENT = os.environ['EVENT']
REF = os.environ['REF'] REF = os.environ['REF']
REPO = os.environ['REPO'] REPO = os.environ['REPO']
REPO_OWNER_ID = os.environ['REPO_OWNER_ID'] REPO_ID = os.environ['REPO_ID']
REPO_OWNER_ID_PYPA = '647025' REPO_ID_GH_ACTION = '178055147'
def set_image(event: str, ref: str, repo: str, repo_owner_id: str) -> str: def set_image(event: str, ref: str, repo: str, repo_id: str) -> str:
if event == 'pull_request' and repo_owner_id == REPO_OWNER_ID_PYPA: if event == 'pull_request' and repo_id == REPO_ID_GH_ACTION:
return '../../../Dockerfile' return '../../../Dockerfile'
docker_ref = ref.replace('/', '-') docker_ref = ref.replace('/', '-')
return f'docker://ghcr.io/{repo}:{docker_ref}' 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 = { action = {
'name': '🏃', 'name': '🏃',