ci: fix variable use

piotrpdev · Sep 10, 2024 · b63b472 · b63b472
1 parent 33a7a42
commit b63b472
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -52,35 +52,32 @@ jobs:
         run: cargo build --locked --release --target=aarch64-unknown-linux-gnu
         env:
           RUSTFLAGS: "-C target-feature=+crt-static"
-          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }}
+          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }} # Used by build.rs
 
       - name: Static build (ARMv7)
         run: cargo build --locked --release --target=armv7-unknown-linux-gnueabihf
         env:
           RUSTFLAGS: "-C target-feature=+crt-static"
-          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }}
+          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }} # Used by build.rs
 
       - name: Static deb build (ARM64)
         run: cargo deb --deb-version $RSPI_BIOS_VERSION --locked --target=aarch64-unknown-linux-gnu
         env:
           RUSTFLAGS: "-C target-feature=+crt-static"
-          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }}
+          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }} # Used by build.rs
 
       - name: Static deb build (ARMv7)
         run: cargo deb --deb-version $RSPI_BIOS_VERSION --locked --target=armv7-unknown-linux-gnueabihf
         env:
           RUSTFLAGS: "-C target-feature=+crt-static"
-          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }}
+          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }} # Used by build.rs
 
       - name: Rename binaries
         run: |
-          cp target/aarch64-unknown-linux-gnu/release/rspi-bios ./rspi-bios_$RSPI_BIOS_VERSION_aarch64-unknown-linux-gnu
-          cp target/armv7-unknown-linux-gnueabihf/release/rspi-bios ./rspi-bios_$RSPI_BIOS_VERSION_armv7-unknown-linux-gnueabihf
-          cp target/aarch64-unknown-linux-gnu/debian/rspi-bios_$RSPI_BIOS_VERSION_arm64.deb ./rspi-bios_$RSPI_BIOS_VERSION_arm64.deb
-          cp target/armv7-unknown-linux-gnueabihf/debian/rspi-bios_$RSPI_BIOS_VERSION_armhf.deb ./rspi-bios_$RSPI_BIOS_VERSION_armhf.deb
-        env:
-          RSPI_BIOS_VERSION: ${{ steps.tag-dry.outputs.new_tag }}
-
+          cp target/aarch64-unknown-linux-gnu/release/rspi-bios ./rspi-bios_${{ steps.tag-dry.outputs.new_tag }}_aarch64-unknown-linux-gnu
+          cp target/armv7-unknown-linux-gnueabihf/release/rspi-bios ./rspi-bios_${{ steps.tag-dry.outputs.new_tag }}_armv7-unknown-linux-gnueabihf
+          cp target/aarch64-unknown-linux-gnu/debian/rspi-bios_${{ steps.tag-dry.outputs.new_tag }}_arm64.deb ./rspi-bios_${{ steps.tag-dry.outputs.new_tag }}_arm64.deb
+          cp target/armv7-unknown-linux-gnueabihf/debian/rspi-bios_${{ steps.tag-dry.outputs.new_tag }}_armhf.deb ./rspi-bios_${{ steps.tag-dry.outputs.new_tag }}_armhf.deb
 
       - name: Tag (Real run)
         id: tag-real