Skip to content
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
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ jobs:
with:
image: ${{ inputs.docker }}
options: '--user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build'
run: ${{ inputs.build }}
# The images' stable toolchain dates from when they were built (Rust
# 1.82), too old for edition 2024 dependencies; update it first.
run: |
rustup update stable --no-self-update
rustup target add ${{ inputs.target }}
Comment thread
wesnel marked this conversation as resolved.
Resolved
${{ inputs.build }}
- name: Build
run: ${{ inputs.build }}
if: ${{ !inputs.docker }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ jobs:
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
build: |
apk add musl-dev gcc make cmake clang llvm build-base
rustup target add x86_64-unknown-linux-musl
export CARGO_BUILD_TARGET="x86_64-unknown-linux-musl"
ln -s /usr/lib/gcc/x86_64-alpine-linux-musl/14.2.0/crtbeginS.o /usr/lib
ln -s /usr/lib/gcc/x86_64-alpine-linux-musl/14.2.0/crtendS.o /usr/lib
Expand Down Expand Up @@ -130,7 +129,6 @@ jobs:
build: |
apk add clang18 llvm18
ln -s /usr/lib/llvm-18/lib/libclang.so.1 /usr/lib/libclang.so
rustup target add aarch64-unknown-linux-musl
export CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc
export CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++
export AR_aarch64_unknown_linux_musl=aarch64-linux-musl-ar
Expand Down
83 changes: 69 additions & 14 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 Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mio = { version = "=0.8.6" }
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
napi = { version = "2.12.1", default-features = false, features = ["napi4", "tokio_rt"] }
napi-derive = "2.12.1"
ngrok = {version = "0.18.0", features = ["hyper", "axum"]}
ngrok = {version = "0.19.0", features = ["hyper", "axum"]}
parking_lot = "0.12.1"
regex = "1.9.5"
rustls = "0.23.25"
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

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

2 changes: 1 addition & 1 deletion src/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ pub(crate) async fn search_listeners(
url: Option<String>,
) -> Vec<Listener> {
let mut listeners: Vec<Listener> = vec![];
for (_, storage) in GLOBAL_LISTENERS.lock().await.iter() {
for storage in GLOBAL_LISTENERS.lock().await.values() {
// filter by session_id, if provided
if let Some(session_id) = session_id.as_ref() {
if session_id.ne(&storage.session.id()) {
Expand Down
1 change: 0 additions & 1 deletion src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ pub(crate) struct SessionBuilder {
}

#[napi]
#[allow(dependency_on_unit_never_type_fallback)]
#[allow(dead_code)]
impl SessionBuilder {
/// Create a new session builder
Expand Down
Loading