Fix Docker build by ensuring all artifacts are named with architecture (amd64 vs arm64)

This commit is contained in:
Tim Donohue
2024-04-09 09:53:21 -05:00
parent a653ece910
commit f4edf92860

View File

@@ -154,7 +154,7 @@ jobs:
if: ${{ ! matrix.isPr }} if: ${{ ! matrix.isPr }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: digests-${{ inputs.build_id }} name: digests-${{ inputs.build_id }}-${{ matrix.arch }}
path: /tmp/digests/* path: /tmp/digests/*
if-no-files-found: error if-no-files-found: error
retention-days: 1 retention-days: 1
@@ -172,7 +172,7 @@ jobs:
# If this build is NOT a PR and passed in a REDEPLOY_DEMO_URL secret, # If this build is NOT a PR and passed in a REDEPLOY_DEMO_URL secret,
# Then redeploy https://demo.dspace.org if this build is for our deployment architecture and demo branch. # Then redeploy https://demo.dspace.org if this build is for our deployment architecture and demo branch.
- name: Redeploy demo.dspace.org (based on maintenace branch) - name: Redeploy demo.dspace.org (based on maintenance branch)
if: | if: |
!matrix.isPR && !matrix.isPR &&
env.REDEPLOY_DEMO_URL != '' && env.REDEPLOY_DEMO_URL != '' &&
@@ -194,8 +194,10 @@ jobs:
- name: Download Docker build digests - name: Download Docker build digests
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: digests-${{ inputs.build_id }}
path: /tmp/digests path: /tmp/digests
# Download digests for both AMD64 and ARM64 into same directory
pattern: digests-${{ inputs.build_id }}-*
merge-multiple: true
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3