From 4dd0d60eeb3aa2aaa6759bbad2210ea5c3a47c2b Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Thu, 14 Nov 2024 20:59:14 +0000 Subject: [PATCH] ci: Normalise slash-containing `github.head_ref` values This fixes CI on #2121. Signed-off-by: Dom Rodriguez --- .github/workflows/main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2eb8a95990..247bd4af6b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,25 +46,30 @@ jobs: # Unzip the package because Upload Artifact will zip up the files - name: Unzip DFU package run: unzip ./build/output/pinetime-mcuboot-app-dfu-*.zip -d ./build/output/pinetime-mcuboot-app-dfu + - name: Set ref_name, but replace slashes with dashes. + shell: bash + env: + ref_name: ${{ github.head_ref || github.ref_name }} + run: echo "REF_NAME=${ref_name//\//-}" >> $GITHUB_ENV - name: Upload DFU artifacts uses: actions/upload-artifact@v3 with: - name: InfiniTime DFU ${{ github.head_ref }} + name: InfiniTime DFU ${{ env.REF_NAME }} path: ./build/output/pinetime-mcuboot-app-dfu/* - name: Upload MCUBoot image artifacts uses: actions/upload-artifact@v3 with: - name: InfiniTime MCUBoot image ${{ github.head_ref }} + name: InfiniTime MCUBoot image ${{ env.REF_NAME }} path: ./build/output/pinetime-mcuboot-app-image-*.bin - name: Upload standalone ELF artifacts uses: actions/upload-artifact@v3 with: - name: InfiniTime image ${{ github.head_ref }} + name: InfiniTime image ${{ env.REF_NAME }} path: ./build/output/src/pinetime-app-*.out - name: Upload resources artifacts uses: actions/upload-artifact@v3 with: - name: InfiniTime resources ${{ github.head_ref }} + name: InfiniTime resources ${{ env.REF_NAME }} path: ./build/output/infinitime-resources-*.zip build-simulator: @@ -105,7 +110,7 @@ jobs: - name: Upload simulator executable uses: actions/upload-artifact@v3 with: - name: infinisim-${{ github.head_ref }} + name: infinisim-${{ env.REF_NAME }} path: build_lv_sim/infinisim get-base-ref-size: