From 3e83c65392bc80733866f1448243346688939fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Wed, 27 Mar 2024 13:30:13 +0100 Subject: [PATCH 1/2] fix: explicitly select nightly toolchain for building without rust-toolchain.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 10 +--------- examples/c/makefile | 4 ++-- rftrace/build.rs | 1 + rust-toolchain.toml | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2eb1105..5b27f70 100644 --- a/.github/workflows/ci.yml +++ b/.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" + run: cargo +nightly rustc -- -Zinstrument-mcount -C passes="ee-instrument" - name: Run run: | mkdir tracedir diff --git a/examples/c/makefile b/examples/c/makefile index aa6fcd3..5e038c8 100644 --- a/examples/c/makefile +++ b/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 diff --git a/rftrace/build.rs b/rftrace/build.rs index a11c98d..fcf9a5a 100755 --- a/rftrace/build.rs +++ b/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]); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 512ce4f..de9120f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2024-01-01" +channel = "nightly" components = [ "rust-src", "llvm-tools-preview", From 13027c08010684611aae90a632a33291ce13bab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Wed, 27 Mar 2024 13:32:33 +0100 Subject: [PATCH 2/2] chore: release version 0.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- examples/hermitrust/Cargo.toml | 4 ++-- examples/rust/Cargo.toml | 4 ++-- rftrace-frontend-ffi/Cargo.toml | 2 +- rftrace-frontend/Cargo.toml | 2 +- rftrace/Cargo.toml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/hermitrust/Cargo.toml b/examples/hermitrust/Cargo.toml index 6276f48..d2baa9b 100755 --- a/examples/hermitrust/Cargo.toml +++ b/examples/hermitrust/Cargo.toml @@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0" edition = "2018" [dependencies] -rftrace = { version = "0.2.0", path="../../rftrace" } -rftrace-frontend = { version = "0.2.0", path="../../rftrace-frontend" } +rftrace = { version = "0.2", path="../../rftrace" } +rftrace-frontend = { version = "0.2", path="../../rftrace-frontend" } [target.'cfg(target_os = "hermit")'.dependencies] hermit = { version = "0.8" } diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml index a2e954e..6ac96d8 100755 --- a/examples/rust/Cargo.toml +++ b/examples/rust/Cargo.toml @@ -8,5 +8,5 @@ license = "MIT OR Apache-2.0" edition = "2018" [dependencies] -rftrace = { version = "0.2.0", path="../../rftrace" } -rftrace-frontend = { version = "0.2.0", path="../../rftrace-frontend" } +rftrace = { version = "0.2", path="../../rftrace" } +rftrace-frontend = { version = "0.2", path="../../rftrace-frontend" } diff --git a/rftrace-frontend-ffi/Cargo.toml b/rftrace-frontend-ffi/Cargo.toml index d3f8561..613212f 100644 --- a/rftrace-frontend-ffi/Cargo.toml +++ b/rftrace-frontend-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rftrace-frontend-ffi" -version = "0.2.0" +version = "0.2.1" authors = [ "Martin Kröning ", "Thomas Lambertz ", diff --git a/rftrace-frontend/Cargo.toml b/rftrace-frontend/Cargo.toml index 4639006..559cef0 100644 --- a/rftrace-frontend/Cargo.toml +++ b/rftrace-frontend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rftrace-frontend" -version = "0.2.0" +version = "0.2.1" authors = [ "Martin Kröning ", "Thomas Lambertz ", diff --git a/rftrace/Cargo.toml b/rftrace/Cargo.toml index 214407d..0accff0 100755 --- a/rftrace/Cargo.toml +++ b/rftrace/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rftrace" -version = "0.2.0" +version = "0.2.1" authors = [ "Martin Kröning ", "Thomas Lambertz ",