fix: explicitly select nightly toolchain for building without rust-to…

…olchain.toml

Signed-off-by: Martin Kröning <[email protected]>

.github/workflows/ci.yml

@@ -31,10 +31,6 @@ jobs:
           sudo apt-get update
           sudo apt-get install uftrace
       - uses: mkroening/rust-toolchain-toml@main
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-01-01
-          components: llvm-tools
       - uses: Swatinem/rust-cache@v2
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -62,15 +58,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install uftrace
       - uses: mkroening/rust-toolchain-toml@main
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-01-01
-          components: llvm-tools
       - uses: Swatinem/rust-cache@v2
         with:
           save-if: ${{ github.ref == 'refs/heads/main' }}
       - name: Build
-        run: cargo +nightly-2024-01-01 rustc -- -Zinstrument-mcount -C passes="ee-instrument<post-inline>"
+        run: cargo +nightly rustc -- -Zinstrument-mcount -C passes="ee-instrument<post-inline>"
       - name: Run
         run: |
           mkdir tracedir

examples/c/makefile

@@ -2,10 +2,10 @@ default: out/debug/librftrace.a out/debug/librftrace_frontend_ffi.a
 	gcc main.c -p -pthread -ldl -lrftrace -lrftrace_frontend_ffi -Lout/debug/ -o test
 
 out/debug/librftrace.a:
-	cargo +nightly-2024-01-01 build --manifest-path ../../rftrace/Cargo.toml --target-dir out
+	cargo +nightly build --manifest-path ../../rftrace/Cargo.toml --target-dir out
 
 out/debug/librftrace_frontend_ffi.a:
-	cargo +nightly-2024-01-01 build --manifest-path ../../rftrace-frontend-ffi/Cargo.toml --target-dir out
+	cargo +nightly build --manifest-path ../../rftrace-frontend-ffi/Cargo.toml --target-dir out
 
 clean:
 	rm -r out

rftrace/build.rs

@@ -13,6 +13,7 @@ fn build_backend() {
     let target = "x86_64-unknown-none";
 
     let mut cmd = cargo();
+    cmd.arg("+nightly");
     cmd.arg("rustc");
 
     cmd.args(&["--target", target]);

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-01-01"
+channel = "nightly"
 components = [
     "rust-src",
     "llvm-tools-preview",