Fix arm-none-eabi-objcopy step

Rudo2204 · Apr 29, 2021 · 9fec774 · 9fec774
1 parent bc68584
commit 9fec774
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -69,15 +69,19 @@ jobs:
           command: build
           args: --release --locked
 
-      - uses: fiam/arm-none-eabi-gcc@v1
-        with:
-          release: '10-2020-q4' # https://launchpad.net/gcc-arm-embedded/+series
-      - run: arm-none-eabi-obj-copy -O binary target/thumbv7em-none-eabihf/release/${{ env.CRATE_NAME }} ${{ env.CRATE_NAME }}.bin
-
       - uses: actions/upload-artifact@master
+        if: startsWith(github.ref, 'refs/tags/v')
         with:
-          name: ${{ env.CRATE_NAME }}.bin
-          path: ${{ env.CRATE_NAME }}.bin
+          name: ${{ env.CRATE_NAME }}
+          path: target/thumbv7em-none-eabihf/release/${{ env.CRATE_NAME }}
+
+      - name: arm-none-eabi-objcopy
+        if: startsWith(github.ref, 'refs/tags/v')
+        shell: bash
+        run: |
+            wget https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+            tar -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+            gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-objcopy -O binary target/thumbv7em-none-eabihf/release/${{ env.CRATE_NAME }} ${{ env.CRATE_NAME }}.bin
 
       - name: Get VERSION
         if: startsWith(github.ref, 'refs/tags/v')
@@ -100,7 +104,7 @@ jobs:
           draft: true
           prerelease: false
           files: |
-            ${{ env.CRATE_NAME }}-${{ steps.get_version.outputs.VERSION }}.bin
             target/thumbv7em-none-eabihf/release/${{ env.CRATE_NAME }}
+            ${{ env.CRATE_NAME }}-${{ steps.get_version.outputs.VERSION }}.bin
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}