Rename artifacts to avoid collision.

.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{success()}}
         with:
-          name: Artifacts
+          name: Slides
           if-no-files-found: error
           path: |
             ./rust-training-*/
@@ -82,20 +82,20 @@ jobs:
   
       - name: Assemble Artifacts
         run: |
-          echo "Making ./rust-training-ferrocene-examples-${{ env.slug }}..."
-          mkdir -p ./rust-training-ferrocene-examples-${{ env.slug }}
-          cp -r ./example-code ./rust-training-ferrocene-examples-${{ env.slug }}
-          echo "Compressing ./rust-training-ferrocene-examples-${{ env.slug }}.zip..."
-          zip -r ./rust-training-ferrocene-examples-${{ env.slug }}.zip ./rust-training-ferrocene-examples-${{ env.slug }}
+          echo "Making ./rust-training-${{ env.slug }}..."
+          mkdir -p ./rust-training-${{ env.slug }}
+          cp -r ./example-code ./rust-training-${{ env.slug }}
+          echo "Compressing ./rust-training-${{ env.slug }}.zip..."
+          zip -r ./rust-training-${{ env.slug }}.zip ./rust-training-${{ env.slug }}
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         if: ${{success()}}
         with:
-          name: Artifacts
+          name: Ferrocene Examples
           if-no-files-found: error
           path: |
-            ./rust-training-ferrocene-examples-*/
+            ./rust-training-*/
 
   build-examples:
     runs-on: ubuntu-20.04
@@ -123,17 +123,17 @@ jobs:
   
       - name: Assemble Artifacts
         run: |
-          echo "Making ./rust-training-examples-${{ env.slug }}..."
-          mkdir -p ./rust-training-examples-${{ env.slug }}
-          cp -r ./example-code ./rust-training-examples-${{ env.slug }}
-          echo "Compressing ./rust-training-examples-${{ env.slug }}.zip..."
-          zip -r ./rust-training-examples-${{ env.slug }}.zip ./rust-training-examples-${{ env.slug }}
+          echo "Making ./rust-training-${{ env.slug }}..."
+          mkdir -p ./rust-training-${{ env.slug }}
+          cp -r ./example-code ./rust-training-${{ env.slug }}
+          echo "Compressing ./rust-training-${{ env.slug }}.zip..."
+          zip -r ./rust-training-${{ env.slug }}.zip ./rust-training-${{ env.slug }}
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         if: ${{success()}}
         with:
-          name: Artifacts
+          name: Examples
           if-no-files-found: error
           path: |
-            ./rust-training-examples-*/
+            ./rust-training-*/

example-code/build-ferrocene.sh

@@ -7,13 +7,11 @@ pushd ./qemu-aarch64v8a
 criticalup install
 ./build.sh "$(criticalup which rustc)"
 criticalup run cargo build --release
-criticalup run cargo clean
 popd
 # And the qemu Aarch32 Armv8-R/Armv7-R example
 pushd ./qemu-aarch32v78r
 criticalup install
 ./build.sh "$(criticalup which rustc)"
 criticalup run cargo build --release
 criticalup run cargo build --target=armv7r-none-eabihf --release
-criticalup run cargo clean
 popd

example-code/build.sh

@@ -6,11 +6,9 @@ set -euo pipefail
 pushd ./native/ffi/use-c-in-rust
 cargo build --all
 cargo test
-cargo clean
 popd
 pushd ./native/stdout
 cargo build --all
-cargo clean
 popd
 # And the C based example
 pushd native/ffi/use-rust-in-c
@@ -20,19 +18,16 @@ popd
 # And the nRF52 examples
 pushd ./nrf52/bsp_demo
 cargo build --release
-cargo clean
 popd
 # Build qemu Aarch64 Armv8-A example
 pushd ./qemu-aarch64v8a
 ./build.sh
 cargo build
-cargo clean
 popd
 # Build qemu Aarch32 Armv8-R/Armv7-R example
 pushd ./qemu-aarch32v78r
 # Can't use the shell script or the default target becuase armv8r isn't available
 # outside Ferrocene
 # ./build.sh
 cargo build --target=armv7r-none-eabihf
-cargo clean
 popd