Skip to content

Commit 9e712af

Browse files
committed
build-and-deploy: save on an unnecessary step
The step that writes out the token required to upload to the Azure Blob container is unneeded; The `pacman-helper.sh` script accepts it as an environment variable (using a lower-cased name), too. The `release-git` workflow already does it that way, and so can the `build-and-deploy` workflow. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f36aee3 commit 9e712af

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -306,22 +306,13 @@ jobs:
306306
name: artifacts
307307
path: artifacts
308308

309-
- name: Prepare home directory for deploying to the Pacman repository
310-
if: env.BUILD_ONLY != 'true' && env.AZURE_BLOBS_TOKEN != ''
311-
env:
312-
AZURE_BLOBS_TOKEN: ${{secrets.AZURE_BLOBS_TOKEN}}
313-
shell: bash
314-
run: |
315-
echo "::add-mask::$(echo "$AZURE_BLOBS_TOKEN" | base64 -w 0)" &&
316-
echo "$AZURE_BLOBS_TOKEN" >"$HOME"/.azure-blobs-token
317-
318309
- name: ${{ env.BUILD_ONLY == 'true' && 'Test-deploy' || 'Deploy' }} Pacman packages
319-
if: env.BUILD_ONLY == 'true' || env.AZURE_BLOBS_TOKEN != ''
310+
if: env.BUILD_ONLY == 'true' || env.azure_blobs_token != ''
320311
shell: bash
321312
env:
322313
GPGKEY: ${{secrets.GPGKEY}}
323314
PACMANDRYRUN: ${{env.BUILD_ONLY}}
324-
AZURE_BLOBS_TOKEN: ${{secrets.AZURE_BLOBS_TOKEN}}
315+
azure_blobs_token: ${{secrets.AZURE_BLOBS_TOKEN}}
325316
run: /usr/src/build-extra/pacman-helper.sh quick_add artifacts/*
326317

327318
- name: Clean up temporary files

0 commit comments

Comments
 (0)