Skip to content

Commit 7552b48

Browse files
build(deps): bump clechasseur/rs-cargo from 2 to 3 in the actions-dependencies group (#43)
* build(deps): bump clechasseur/rs-cargo in the actions-dependencies group Bumps the actions-dependencies group with 1 update: [clechasseur/rs-cargo](https://github.com/clechasseur/rs-cargo). Updates `clechasseur/rs-cargo` from 2 to 3 - [Release notes](https://github.com/clechasseur/rs-cargo/releases) - [Commits](clechasseur/rs-cargo@v2...v3) --- updated-dependencies: - dependency-name: clechasseur/rs-cargo dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * fix * fix * FIX * FIX * REMOVE ZIG * Merge remote-tracking branch 'origin/dependabot/github_actions/actions-dependencies-2324774595' into dependabot/github_actions/actions-dependencies-2324774595 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: iHsin <root@itsusinn.eu.org>
1 parent d776345 commit 7552b48

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.github/workflows/ci.yml

+18-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
env:
1515
PACKAGE: "tuic-server"
1616
PACKAGE2: "tuic-client"
17-
RUST_TOOLCHAIN: "nightly-2024-12-29"
17+
RUST_TOOLCHAIN: "nightly-2025-02-12"
1818

1919
jobs:
2020
compile:
@@ -32,7 +32,7 @@ jobs:
3232
# target: x86_64-unknown-linux-gnu
3333
# release-name: x86_64-linux
3434
# toolchain: stable
35-
# cross: true
35+
# tool: cross
3636
# postfix: ""
3737
# extra-args: ""
3838
# components: ""
@@ -122,6 +122,8 @@ jobs:
122122
target: x86_64-unknown-freebsd
123123
release-name: x86_64-freebsd
124124
tool: cross
125+
skip-test: true
126+
extra-args: "--no-default-features --features ring"
125127
# RISC-V
126128
- os: ubuntu-latest
127129
target: riscv64gc-unknown-linux-gnu
@@ -133,6 +135,7 @@ jobs:
133135
target: loongarch64-unknown-linux-gnu
134136
release-name: loongarch64-linux
135137
tool: cross
138+
extra-args: "--no-default-features --features ring"
136139

137140
# Linux mips: tier-3, pity
138141
# Windows gnu: tokio dont work
@@ -158,15 +161,23 @@ jobs:
158161
target: ${{ matrix.target }}
159162
components: ${{ matrix.components || 'rustfmt, clippy' }}
160163

164+
- name: Install rust targets & cross
165+
if: matrix.tool == 'cross'
166+
run: |
167+
rustup target add ${TARGET}
168+
rm -f ~/.cargo/bin/cross*
169+
cargo install cross --git https://github.com/cross-rs/cross
170+
env:
171+
TARGET: ${{ matrix.target }}
172+
161173
- name: Cargo fmt
162-
uses: clechasseur/rs-cargo@v2
174+
uses: clechasseur/rs-cargo@v3
163175
with:
164-
tool: ${{ matrix.tool }}
165176
command: fmt
166177
args: --all -- --check
167178

168179
- name: Cargo clippy
169-
uses: clechasseur/rs-cargo@v2
180+
uses: clechasseur/rs-cargo@v3
170181
with:
171182
tool: ${{ matrix.tool }}
172183
command: clippy
@@ -175,7 +186,7 @@ jobs:
175186
RUSTFLAGS: ${{ matrix.rustflags }}
176187

177188
- name: Cargo test
178-
uses: clechasseur/rs-cargo@v2
189+
uses: clechasseur/rs-cargo@v3
179190
if: ${{ !matrix.skip-test }}
180191
with:
181192
tool: ${{ matrix.tool }}
@@ -186,7 +197,7 @@ jobs:
186197
RUSTFLAGS: ${{ matrix.rustflags }}
187198

188199
- name: Cargo build
189-
uses: clechasseur/rs-cargo@v2
200+
uses: clechasseur/rs-cargo@v3
190201
with:
191202
tool: ${{ matrix.tool }}
192203
command: build

Cross.toml

-3
This file was deleted.

tuic-server/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository.workspace = true
1313

1414
[features]
1515
default = ["aws-lc-rs"]
16-
ring = ["rustls/ring", "rcgen/ring", "quinn/rustls-ring"]
16+
ring = ["rustls/ring", "rcgen/ring", "quinn/rustls-ring", ]
1717
aws-lc-rs = ["rustls/aws-lc-rs", "rcgen/aws_lc_rs", "quinn/rustls-aws-lc-rs"]
1818
jemallocator = ["tikv-jemallocator"]
1919

0 commit comments

Comments
 (0)