Skip to content

Commit c26a117

Browse files
authored
move to rust 1.93 (#425)
* move to rust 1.93 * rust 1.75 test removed, no crago lock test added * clippy fix * git restore instead of bak * switched to main
1 parent df12880 commit c26a117

File tree

6 files changed

+192
-254
lines changed

6 files changed

+192
-254
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ jobs:
3838
working-directory: zenoh-jni
3939
run: cargo fmt --all --check
4040

41-
- name: Clippy Check
41+
- name: Clippy Check without Cargo.lock
4242
working-directory: zenoh-jni
43-
run: cargo clippy --all-targets --all-features -- -D warnings
43+
run: |
44+
rm Cargo.lock
45+
cargo clippy --all-targets --all-features -- -D warnings
46+
git restore Cargo.lock
4447
4548
- name: Check for feature leaks
4649
working-directory: zenoh-jni
@@ -67,28 +70,6 @@ jobs:
6770
config: '.markdownlint.yaml'
6871
globs: '**/README.md'
6972

70-
check_rust:
71-
name: Check zenoh-java using Rust 1.75
72-
runs-on: ubuntu-latest
73-
strategy:
74-
fail-fast: false
75-
steps:
76-
- name: Clone this repository
77-
uses: actions/checkout@v4
78-
79-
- name: Update Rust 1.75.0 toolchain
80-
run: rustup update 1.75.0
81-
82-
- name: Setup rust-cache
83-
uses: Swatinem/rust-cache@v2
84-
with:
85-
cache-bin: false
86-
87-
- name: Check zenoh-java with rust 1.75.0
88-
run: |
89-
cd zenoh-jni
90-
cargo +1.75.0 check --release --bins --lib
91-
9273
# NOTE: In GitHub repository settings, the "Require status checks to pass
9374
# before merging" branch protection rule ensures that commits are only merged
9475
# from branches where specific status checks have passed. These checks are
@@ -97,7 +78,7 @@ jobs:
9778
ci:
9879
name: CI status checks
9980
runs-on: ubuntu-latest
100-
needs: [check_rust, build, markdown_lint]
81+
needs: [build, markdown_lint]
10182
if: always()
10283
steps:
10384
- name: Check whether all jobs pass

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.85.0"
2+
channel = "1.93.0"

0 commit comments

Comments
 (0)