Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release version 0.2.1 #38

Merged
merged 2 commits into from
Mar 27, 2024
Merged

chore: release version 0.2.1 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e83c65
fix: explicitly select nightly toolchain for building without rust-to…
mkroening Mar 27, 2024
13027c0
chore: release version 0.2.1
mkroening Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/c/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/hermitrust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
4 changes: 2 additions & 2 deletions examples/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion rftrace-frontend-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rftrace-frontend-ffi"
version = "0.2.0"
version = "0.2.1"
authors = [
"Martin Kröning <[email protected]>",
"Thomas Lambertz <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion rftrace-frontend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rftrace-frontend"
version = "0.2.0"
version = "0.2.1"
authors = [
"Martin Kröning <[email protected]>",
"Thomas Lambertz <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion rftrace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rftrace"
version = "0.2.0"
version = "0.2.1"
authors = [
"Martin Kröning <[email protected]>",
"Thomas Lambertz <[email protected]>",
Expand Down
1 change: 1 addition & 0 deletions rftrace/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2024-01-01"
channel = "nightly"
components = [
"rust-src",
"llvm-tools-preview",
Expand Down