Skip to content

Commit

Permalink
fix: Set rustc to 1.75.0 (2023-12-28) (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
fmarek-kindred authored Jul 8, 2024
1 parent f504dd3 commit c4ef114
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.73.0
- uses: dtolnay/rust-toolchain@1.75.0
with:
toolchain: 1.73.0
toolchain: 1.75.0
- run: scripts/ubuntu-setup.sh
- run: rustup component add rustfmt clippy
- name: cargo build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-10-03
toolchain: nightly-2023-12-28
- run: scripts/ubuntu-setup.sh
- run: rustup component add llvm-tools-preview
- run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf -
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.73.0" #1.68
channel = "1.75.0"
6 changes: 3 additions & 3 deletions scripts/coverage-report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Co
excludes="cohort_sdk_js"

echo "Compiling $app_name"
cargo +nightly-2023-10-03 build
cargo +nightly-2023-12-28 build

echo "Testing $app_name"
export LLVM_PROFILE_FILE="${app_name}-%p-%m.profraw"
cargo +nightly-2023-10-03 test --tests --workspace --exclude ${excludes} # don't run doctests
cargo +nightly-2023-12-28 test --tests --workspace --exclude ${excludes} # don't run doctests

rm ccov.zip 2> /dev/null || true
zip -0 ccov.zip `find . \( -name "*.gc*" \) -print | grep -v ${excludes}`
Expand All @@ -38,7 +38,7 @@ grcov ccov.zip -s . --llvm --ignore-not-existing --ignore "/*" --excl-start "\\
rm ccov.zip

# Re-run tests with JSON output
cargo +nightly-2023-10-03 test --tests --workspace --exclude ${excludes} -- -Z unstable-options --format json --report-time > coverage/test-report.json
cargo +nightly-2023-12-28 test --tests --workspace --exclude ${excludes} -- -Z unstable-options --format json --report-time > coverage/test-report.json

if [ "$1" == "--open" ]; then
index="file://$(pwd)/${base_dir}/../coverage/index.html"
Expand Down

0 comments on commit c4ef114

Please sign in to comment.