Skip to content

Commit 922f20a

Browse files
authored
Merge pull request #100 from git-for-windows/arm64-missing-pieces
release-git: add missing aarch64 input to github-release action
2 parents bea1632 + df180da commit 922f20a

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

.github/actions/pacman-packages/action.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ inputs:
3333
git_artifacts_x86_64_workflow_run_id:
3434
description: 'ID of the git-artifacts (x86_64) workflow run'
3535
required: true
36+
git_artifacts_aarch64_workflow_run_id:
37+
description: 'ID of the git-artifacts (aarch64) workflow run'
38+
required: true
3639
gpg-key:
3740
description: 'The GPG key to use to sign the updated Pacman database'
3841
required: true
@@ -58,7 +61,7 @@ runs:
5861
rev: ${{ inputs.rev }}
5962
check-run-name: "pacman-packages"
6063
title: "Deploy the mingw-w64-git packages ${{ inputs.display-version }}"
61-
summary: "Downloading the Pacman packages from ${{ inputs.git_artifacts_x86_64_workflow_run_id }} and ${{ inputs.git_artifacts_i686_workflow_run_id }} and deploying them to the Pacman Repository"
64+
summary: "Downloading the Pacman packages from ${{ inputs.git_artifacts_x86_64_workflow_run_id }}, ${{ inputs.git_artifacts_i686_workflow_run_id }}, and ${{ inputs.git_artifacts_aarch64_workflow_run_id }} and deploying them to the Pacman Repository"
6265
text: "For details, see [this run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id}})."
6366
details-url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id}}"
6467
- name: Download artifacts
@@ -84,6 +87,15 @@ runs:
8487
${{ inputs.git_artifacts_i686_workflow_run_id }},
8588
'pkg-i686'
8689
)
90+
91+
await getWorkflowRunArtifact(
92+
console,
93+
${{ toJSON(inputs.artifacts-token) }},
94+
artifactsOwner,
95+
artifactsRepo,
96+
${{ inputs.git_artifacts_aarch64_workflow_run_id }},
97+
'pkg-aarch64'
98+
)
8799
- name: Download Git for Windows SDK
88100
uses: git-for-windows/setup-git-for-windows-sdk@v1
89101
with:
@@ -113,7 +125,7 @@ runs:
113125
GPGKEY: ${{ inputs.gpg-key }}
114126
azure_blobs_token: ${{ inputs.azure-blobs-token }}
115127
run: |
116-
"$RUNNER_TEMP"/build-extra/pacman-helper.sh quick_add pkg-x86_64/*.tar.* pkg-i686/*.tar.*
128+
"$RUNNER_TEMP"/build-extra/pacman-helper.sh quick_add pkg-x86_64/*.tar.* pkg-i686/*.tar.* pkg-aarch64/*.tar.*
117129
- name: update check-run
118130
if: always()
119131
uses: ./.github/actions/check-run-action

.github/workflows/release-git.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
artifacts-token: ${{ secrets.GITHUB_TOKEN }}
126126
git_artifacts_i686_workflow_run_id: ${{ env.I686_WORKFLOW_RUN_ID }}
127127
git_artifacts_x86_64_workflow_run_id: ${{ env.X86_64_WORKFLOW_RUN_ID }}
128+
git_artifacts_aarch64_workflow_run_id: ${{ env.AARCH64_WORKFLOW_RUN_ID }}
128129
announcement-mail:
129130
needs: ['setup', 'github-release']
130131
runs-on: ubuntu-latest
@@ -188,6 +189,7 @@ jobs:
188189
artifacts-token: ${{ secrets.GITHUB_TOKEN }}
189190
git_artifacts_i686_workflow_run_id: ${{ env.I686_WORKFLOW_RUN_ID }}
190191
git_artifacts_x86_64_workflow_run_id: ${{ env.X86_64_WORKFLOW_RUN_ID }}
192+
git_artifacts_aarch64_workflow_run_id: ${{ env.AARCH64_WORKFLOW_RUN_ID }}
191193
gpg-key: ${{ secrets.GPGKEY }}
192194
priv-gpg-key: ${{ secrets.PRIVGPGKEY }}
193195
azure-blobs-token: ${{ secrets.AZURE_BLOBS_TOKEN }}

0 commit comments

Comments
 (0)