From 425b1fc77c77756968590bdbba366c8721736c23 Mon Sep 17 00:00:00 2001 From: mrg Date: Wed, 5 Feb 2025 18:20:19 -0600 Subject: [PATCH 1/3] add after defaulting to beta/nightly --- .github/workflows/weekly-canary-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/weekly-canary-build.yml b/.github/workflows/weekly-canary-build.yml index 0e8d9c82..9e0cb91a 100644 --- a/.github/workflows/weekly-canary-build.yml +++ b/.github/workflows/weekly-canary-build.yml @@ -23,13 +23,13 @@ jobs: - name: Install targets run: | rustup target add thumbv7em-none-eabihf - rustup component add rust-src - rustup component add rustfmt - name: Update and set default Rust run: | rustup update ${{ matrix.rust-channel }} rustup default ${{ matrix.rust-channel }} + rustup component add rust-src + rustup component add rustfmt - name: Find slug name run: | @@ -41,4 +41,4 @@ jobs: env: # Or as an environment variable HIDDEN_MESSAGE: ${{ secrets.HIDDEN_MESSAGE }} run: | - ./build.sh "./rust-exercises-${{ env.slug }}" \ No newline at end of file + ./build.sh "./rust-exercises-${{ env.slug }}" From ff851aa3c27e62ac4a095036bc4ca628f89a9211 Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 6 Feb 2025 09:23:32 -0600 Subject: [PATCH 2/3] merge the action sections --- .github/workflows/weekly-canary-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/weekly-canary-build.yml b/.github/workflows/weekly-canary-build.yml index 9e0cb91a..eb11cdc5 100644 --- a/.github/workflows/weekly-canary-build.yml +++ b/.github/workflows/weekly-canary-build.yml @@ -20,12 +20,9 @@ jobs: with: tool: mdslides@0.3,mdbook@0.4,mdbook-mermaid@0.12,flip-link@0.1.10 - - name: Install targets + - name: Install targets, update, set default Rust run: | rustup target add thumbv7em-none-eabihf - - - name: Update and set default Rust - run: | rustup update ${{ matrix.rust-channel }} rustup default ${{ matrix.rust-channel }} rustup component add rust-src From 47f8e5f2a3c2a41a033e09ac45f1105310a0f2ae Mon Sep 17 00:00:00 2001 From: mrg Date: Fri, 7 Feb 2025 08:32:51 -0600 Subject: [PATCH 3/3] add cross compile targets after you've set default toolchain --- .github/workflows/weekly-canary-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/weekly-canary-build.yml b/.github/workflows/weekly-canary-build.yml index eb11cdc5..76b21ea4 100644 --- a/.github/workflows/weekly-canary-build.yml +++ b/.github/workflows/weekly-canary-build.yml @@ -22,11 +22,11 @@ jobs: - name: Install targets, update, set default Rust run: | - rustup target add thumbv7em-none-eabihf rustup update ${{ matrix.rust-channel }} rustup default ${{ matrix.rust-channel }} rustup component add rust-src rustup component add rustfmt + rustup target add thumbv7em-none-eabihf - name: Find slug name run: |