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.

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

build(deps): bump serde from 1.0.216 to 1.0.217 in the rust-dependencies group #663

Merged
merged 10 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 15 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
REGISTRY: "ghcr.io"
IMAGE_NAME: "clash-rs"
RUST_LOG: "clash=TRACE"

RUST_TOOLCHAIN: "nightly-2024-12-20"

# Arm builder https://github.blog/changelog/2024-09-03-github-actions-arm64-linux-and-windows-runners-are-now-generally-available/
jobs:
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
postfix: ".exe"
extra-args: -F "shadowsocks, tuic, onion"
rustflags: >-
-Ctarget-feature=+crt-static
-Ctarget-feature=+crt-static
-Clink-args=/NODEFAULTLIB:libvcruntimed.lib
-Clink-args=/NODEFAULTLIB:vcruntime.lib
-Clink-args=/NODEFAULTLIB:vcruntimed.lib
Expand Down Expand Up @@ -223,14 +223,17 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain || 'nightly' }}
target: ${{ matrix.target }}
toolchain: ${{ matrix.toolchain || env.RUST_TOOLCHAIN || 'nightly' }}
targets: ${{ matrix.target }}
components: ${{ matrix.components || 'rustfmt, clippy' }}
- name: Install cross
- name: Install rust targets & cross
if: ${{ matrix.cross }}
run: |
rustup target add ${TARGET}
rm -f ~/.cargo/bin/cross*
cargo install cross --git https://github.com/cross-rs/cross
env:
TARGET: ${{ matrix.target }}
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
Expand All @@ -256,7 +259,7 @@ jobs:
args: --all -- --check
env:
CLASH_DOCKER_TEST: "true"

- name: Cargo clippy
uses: clechasseur/rs-cargo@v2
with:
Expand Down Expand Up @@ -336,7 +339,7 @@ jobs:
with:
name: binaries
path: ./packages

- name: Create SHA256Sums.txt and version.txt
run: |
cd packages
Expand Down Expand Up @@ -370,7 +373,7 @@ jobs:
files: |
packages/*
LICENSE*

- name: Delete old latest nightly release
if: startsWith(github.ref, 'refs/heads/master')
uses: actions/github-script@v7
Expand All @@ -389,7 +392,7 @@ jobs:
tag_name: latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Github nightly release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/heads/master')
Expand All @@ -402,7 +405,7 @@ jobs:
files: |
packages/*
LICENSE*

docker-image:
needs: [ compile ]
name: Docker Image
Expand Down Expand Up @@ -443,14 +446,14 @@ jobs:
run: |
mv ./clash-rs/clash-x86_64-unknown-linux-musl ./clash-rs/clash-amd64
mv ./clash-rs/clash-aarch64-unknown-linux-musl ./clash-rs/clash-arm64

- name: Log in to Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: watfaq
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push release
uses: docker/build-push-action@v6
with:
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clash_lib/src/common/succinct_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ impl DomainSet {

let mut n = 0;
for i in 0..self.label_bit_map.len() << 6 {
let z = self.label_bit_map[i >> 6] >> (i & 63) & 1;
let z = (self.label_bit_map[i >> 6] >> (i & 63)) & 1;
if z == 1 && n & 63 == 0 {
self.selects.push(i as i32);
}
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 = "nightly" # until https://github.com/rust-lang/rust-clippy/issues/13457
channel = "nightly-2024-12-20"
Loading