Skip to content

Commit 0c339bf

Browse files
authored
switch to rust 1.93 (#679)
* bump to 1.93, no 1.75 check * ci fix * corrected cargo.lock restore * pinned deps removed * switched to main
1 parent 7727379 commit 0c339bf

File tree

4 files changed

+197
-256
lines changed

4 files changed

+197
-256
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@ jobs:
5858
5959
- name: Code format check
6060
run: cargo fmt --check -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
61-
- name: Clippy
62-
run: cargo clippy --all -- -D warnings
61+
- name: Clippy without Cargo.lock
62+
run: |
63+
rm Cargo.lock
64+
cargo clippy --all -- -D warnings
65+
git restore Cargo.lock
6366
6467
- name: Build zenoh-plugin-dds
6568
run: cargo build -p zenoh-plugin-dds --verbose --all-targets
@@ -112,33 +115,6 @@ jobs:
112115
config: '.markdownlint.yaml'
113116
globs: '**/README.md'
114117

115-
check_rust:
116-
name: Check ${{ github.repository }} using Rust 1.75
117-
runs-on: ubuntu-latest
118-
strategy:
119-
fail-fast: false
120-
steps:
121-
- name: Clone this repository
122-
uses: actions/checkout@v4
123-
124-
# cyclors 0.3.x does not compile with cmake 4
125-
- name: Install cmake
126-
uses: jwlawson/actions-setup-cmake@v2
127-
with:
128-
cmake-version: '3.31.x'
129-
130-
- name: Update Rust 1.75.0 toolchain
131-
run: rustup update 1.75.0
132-
133-
- name: Setup rust-cache
134-
uses: Swatinem/rust-cache@v2
135-
with:
136-
cache-bin: false
137-
138-
- name: Check ${{ github.repository }} with rust 1.75.0
139-
run: |
140-
cargo +1.75.0 check --release --bins --lib
141-
142118
# NOTE: In GitHub repository settings, the "Require status checks to pass
143119
# before merging" branch protection rule ensures that commits are only merged
144120
# from branches where specific status checks have passed. These checks are
@@ -147,7 +123,7 @@ jobs:
147123
ci:
148124
name: CI status checks
149125
runs-on: ubuntu-latest
150-
needs: [check_rust, build, markdown_lint]
126+
needs: [build, markdown_lint]
151127
if: always()
152128
steps:
153129
- name: Check whether all jobs pass

0 commit comments

Comments
 (0)