Merge branch 'main' into feature/toolkit-receipt-support

radixdlt · Sep 6, 2024 · f939559 · f939559
2 parents a491f7f + ae6a306
commit f939559
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/release-kotlin.yml b/.github/workflows/release-kotlin.yml
@@ -37,7 +37,7 @@ jobs:
           rustup toolchain install nightly-2024-02-01
 
           # Update both toolchains
-          rustup update nightly-nightly-2024-07-30
+          rustup update nightly-2024-07-30
           rustup update nightly-2024-02-01
 
           # Add target

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-nightly-2024-07-30
+        toolchain: nightly-2024-07-30
         default: true
         components: rustfmt, clippy
     - name: Install cargo nextest
@@ -67,7 +67,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-nightly-2024-07-30
+        toolchain: nightly-2024-07-30
         default: true
         components: rustfmt
     - name: Check formatting
@@ -79,7 +79,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-nightly-2024-07-30
+        toolchain: nightly-2024-07-30
         default: true
         profile: minimal
     - name: Cargo Check
@@ -91,7 +91,7 @@ jobs:
     - name: Install Rust Toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: nightly-nightly-2024-07-30
+        toolchain: nightly-2024-07-30
         default: true
         components: rustfmt, clippy
     - name: Clippy Check

diff --git a/scripts/build_wasm.sh b/scripts/build_wasm.sh
@@ -1,6 +1,6 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cargo +nightly-nightly-2024-07-30 build \
+cargo +nightly-2024-07-30 build \
     -Z build-std=std,panic_abort \
     -Z build-std-features=panic_immediate_abort \
     --manifest-path="$SCRIPT_DIR/../Cargo.toml" \