Skip to content

Commit 9035c05

Browse files
committed
ci: disambiguate package artifact names
Release jobs now separate the package name from the distro with an underscore in build artifact names. This prevents the docker package release from downloading docker-cli and docker-engine artifacts through the build-pkg-docker-* prefix pattern. Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent 123a896 commit 9035c05

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/.build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
include: ${{ fromJson(needs.prepare.outputs.includes) }}
157157
with:
158158
job-name-prefix: ${{ matrix.distro }}
159-
artifact-name: build-pkg-${{ inputs.name }}-${{ matrix.distro }}
159+
artifact-name: build-pkg-${{ inputs.name }}_${{ matrix.distro }}
160160
artifact-upload: true
161161
artifact-retention-days: 1
162162
output: local
@@ -187,7 +187,7 @@ jobs:
187187
name: Download artifacts
188188
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
189189
with:
190-
name: build-pkg-${{ inputs.name }}-${{ matrix.distro }}
190+
name: build-pkg-${{ inputs.name }}_${{ matrix.distro }}
191191
path: ./bin/pkg/${{ inputs.name }}/${{ matrix.distro }}
192192
-
193193
name: Set up QEMU
@@ -240,7 +240,7 @@ jobs:
240240
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
241241
with:
242242
path: /tmp/build-pkg
243-
pattern: build-pkg-${{ inputs.name }}-*
243+
pattern: build-pkg-${{ inputs.name }}_*
244244
merge-multiple: false
245245
-
246246
name: Arrange artifacts
@@ -259,7 +259,7 @@ jobs:
259259
260260
fs.mkdirSync(destinationRoot, {recursive: true});
261261
for (const include of includes) {
262-
const artifact = path.join('/tmp', 'build-pkg', `build-pkg-${inputName}-${include.distro}`);
262+
const artifact = path.join('/tmp', 'build-pkg', `build-pkg-${inputName}_${include.distro}`);
263263
if (!fs.existsSync(artifact) || !fs.statSync(artifact).isDirectory()) {
264264
core.setFailed(`missing artifact: ${artifact}`);
265265
return;

0 commit comments

Comments
 (0)