remove more nightly

mobile-bungalow · Oct 23, 2024 · f08b60c · f08b60c
1 parent 58385f9
commit f08b60c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,6 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  CARGO_MAKE_TOOLCHAIN: stable
   CARGO_MAKE_CI: true
   ANDROID_API: 34
   ANDROID_NDK_VERSION: 26.3.11579264
@@ -107,10 +106,9 @@ jobs:
       - uses: ./tests/support/test_server/
         if: ${{ matrix.os == 'macos-15' }}
 
-      - name: Install Rust Nightly
-        uses: dtolnay/rust-toolchain@master
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
           targets: armv7-linux-androideabi
             aarch64-linux-android
             i686-linux-android
@@ -159,15 +157,12 @@ jobs:
     runs-on: macos-15
 
     steps:
-      - name: Set nightly env for t3 targets.
-        run: export CARGO_MAKE_TOOLCHAIN="nightly"
-
       - uses: actions/checkout@v4
       - name: Install Rust Nightly
         uses: dtolnay/rust-toolchain@master
         with:
           # nightly needed for t3
-          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
+          toolchain: nightly
           components: rust-src
           targets: aarch64-apple-ios-sim
             aarch64-apple-ios
@@ -311,10 +306,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./tests/support/test_server/
-      - name: Install Rust Nightly
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
       - name: Cache
         uses: actions/cache@v4
         with:
@@ -370,14 +363,11 @@ jobs:
         include:
           - rust-target: "aarch64-apple-ios-sim"
             apple-sim: "iPhone 16"
-            toolchain: stable
             build-std: ""
           - rust-target: "aarch64-apple-tvos-sim"
-            toolchain: nightly
             apple-sim: "Apple TV 4K (3rd generation)"
             build-std: "-Zbuild-std"
           - rust-target: "aarch64-apple-watchos-sim"
-            toolchain: nightly
             apple-sim: "Apple Watch Ultra 2 (49mm)"
             build-std: "-Zbuild-std"
     steps:
@@ -389,7 +379,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: ${{ env.CARGO_MAKE_TOOLCHAIN }}
           components: rust-src
           targets: aarch64-apple-ios-sim
 

diff --git a/Makefile.toml b/Makefile.toml
@@ -11,7 +11,7 @@ CARGO_MAKE_RUST_SCRIPT_PROVIDER = "rust-script"
 CARGO_MAKE_USE_WORKSPACE_PROFILE = true
 CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = "--no-fail-fast"
 CARGO_TARGET_DIR = { value = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
-CARGO_MAKE_TOOLCHAIN = { value = "nightly", condition = { env_not_set = ["CARGO_MAKE_TOOLCHAIN"] } }
+CARGO_MAKE_TOOLCHAIN = { value = "stable", condition = { env_not_set = ["CARGO_MAKE_TOOLCHAIN"] } }
 CARGO_BUILD_TYPE = { source = "${CARGO_MAKE_PROFILE}", default_value = "debug", mapping = { "development" = "debug", "release" = "release" } }
 CARGO_PROFILE = { source = "${CARGO_BUILD_TYPE}", mapping = { "debug" = "dev", "release" = "release" } }
 BACKTRACE_DEFAULT = { source = "${CARGO_MAKE_CI}", mapping = { "true" = "1", "false" = "0" } }
@@ -138,7 +138,7 @@ category = "Build"
 description = "Compiles for all targets needed to produce a universal library for watchOS and tvOS"
 command = "rustup"
 args = [
-    "run", "${CARGO_MAKE_TOOLCHAIN}",
+    "run", "nightly", # we need nightly for the nostd targets
     "cargo", "build",
     "--profile", "${CARGO_PROFILE}",
     "@@remove-empty(CARGO_MAKE_CARGO_VERBOSE_FLAGS)",