github: Use dawidd6/action-download-artifact with the new ref: option

This allows specifying either a commit or a branch in the same
field, allowing simplifying both the workflow inputs, and
the expressions for passing commit/branch to both
dawidd6/action-download-artifact and actions/checkout.

This new option is available since
https://github.com/dawidd6/action-download-artifact/pull/329.
This commit is contained in:
Martin Storsjö committed 2025-06-03 16:36:12 +03:00
1 parent 5110f3da62
commit 9633e7501c
5 files changed
+34 -58

No files matched your search

+8 -13
View File
@@ -2,11 +2,8 @@ name: Build docker images
on:
workflow_dispatch:
inputs:
commit:
description: 'Commit to extract from'
type: string
branch:
description: 'Branch to extract from'
ref:
description: 'Ref to extract from'
type: string
default: 'master'
login:
@@ -25,12 +22,11 @@ jobs:
TAG: ${{steps.get-parameters.outputs.TAG}}
steps:
- name: Download build parameters
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v10
with:
workflow: build.yml
workflow_conclusion: success
commit: ${{inputs.commit}}
branch: ${{inputs.commit == '' && inputs.branch || ''}}
ref: ${{inputs.ref}}
event: push
name: parameters
- name: Get build parameters
@@ -45,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ (inputs.commit != '' && inputs.commit) || inputs.branch }}
ref: ${{inputs.ref}}
- name: Log in to Docker Hub
if: ${{inputs.login}}
uses: docker/login-action@v3
@@ -77,15 +73,14 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ (inputs.commit != '' && inputs.commit) || inputs.branch }}
ref: ${{inputs.ref}}
- name: Download toolchain
if: ${{matrix.file == 'Dockerfile.toolchain'}}
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v10
with:
workflow: build.yml
workflow_conclusion: success
commit: ${{inputs.commit}}
branch: ${{inputs.commit == '' && inputs.branch || ''}}
ref: ${{inputs.ref}}
event: push
name: linux-ucrt-.*
name_is_regexp: true