From 5c04ea17d3d687650845cd24569f314db9b6f6f8 Mon Sep 17 00:00:00 2001 From: cijiugechu Date: Fri, 6 Oct 2023 19:08:24 +0800 Subject: [PATCH 1/6] chore: explicitly set the toolchain channel --- rust/rust-toolchain.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 rust/rust-toolchain.toml diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml new file mode 100644 index 00000000000..80ee012b19f --- /dev/null +++ b/rust/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +# Use nightly for better access to the latest Rust features. +# This date is aligned to stable release dates. +channel = "nightly-2023-10-05" \ No newline at end of file From d78c11eba0387175c8bd9c0bb4f66751c62350ce Mon Sep 17 00:00:00 2001 From: cijiugechu Date: Fri, 6 Oct 2023 19:50:32 +0800 Subject: [PATCH 2/6] set `profile` to default --- rust/rust-toolchain.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml index 80ee012b19f..4e3afc3182f 100644 --- a/rust/rust-toolchain.toml +++ b/rust/rust-toolchain.toml @@ -1,4 +1,5 @@ [toolchain] +profile = "default" # Use nightly for better access to the latest Rust features. # This date is aligned to stable release dates. channel = "nightly-2023-10-05" \ No newline at end of file From 5d8585139b16837e2c83245af19ff45df2662423 Mon Sep 17 00:00:00 2001 From: cijiugechu Date: Fri, 6 Oct 2023 20:21:38 +0800 Subject: [PATCH 3/6] add target in ci --- .github/workflows/build-and-tests.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml index 65d2b65813d..45447e134e4 100644 --- a/.github/workflows/build-and-tests.yml +++ b/.github/workflows/build-and-tests.yml @@ -59,7 +59,10 @@ jobs: target: x86_64-pc-windows-msvc name: wasm is-wasm-build: true - build: npm run build:wasm + build: |- + set - && + rustup target add wasm32-unknown-unknown && + npm run build:wasm path: | wasm/ .empty @@ -67,7 +70,10 @@ jobs: target: x86_64-pc-windows-msvc name: wasm-node is-wasm-build: true - build: npm run build:wasm:node + build: |- + set - && + rustup target add wasm32-unknown-unknown && + npm run build:wasm:node path: | wasm-node/ .empty @@ -81,6 +87,8 @@ jobs: target: x86_64-pc-windows-msvc - host: windows-latest build: | + set -e && + rustup target add i686-pc-windows-msvc && npm run build:napi -- --release --target i686-pc-windows-msvc target: i686-pc-windows-msvc - host: ubuntu-latest @@ -101,7 +109,9 @@ jobs: - host: macos-latest target: aarch64-apple-darwin build: | - npm run build:napi -- --release --target aarch64-apple-darwin + set -e && + rustup target add aarch64-apple-darwin && + npm run build:napi -- --release --target aarch64-apple-darwin && strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu From 1b550750b9cd7c4f6abba014724c87c70329e472 Mon Sep 17 00:00:00 2001 From: cijiugechu Date: Fri, 6 Oct 2023 21:08:34 +0800 Subject: [PATCH 4/6] nightly specifier --- .github/workflows/build-and-tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml index 45447e134e4..fb0ec8506ae 100644 --- a/.github/workflows/build-and-tests.yml +++ b/.github/workflows/build-and-tests.yml @@ -96,7 +96,7 @@ jobs: docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian build: |- set -e && - rustup default nightly && + rustup target add x86_64-unknown-linux-gnu && npm run build:napi -- --release --target x86_64-unknown-linux-gnu && strip *.node - host: ubuntu-latest @@ -104,7 +104,6 @@ jobs: docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine build: |- set -e && - rustup default nightly && npm run build:napi -- --release && strip *.node - host: macos-latest target: aarch64-apple-darwin @@ -118,7 +117,6 @@ jobs: docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: |- set -e && - rustup default nightly && rustup target add aarch64-unknown-linux-gnu && npm run build:napi -- --release --target aarch64-unknown-linux-gnu && aarch64-unknown-linux-gnu-strip *.node @@ -169,7 +167,7 @@ jobs: uses: dtolnay/rust-toolchain@stable if: ${{ !matrix.settings.docker }} with: - toolchain: nightly + toolchain: nightly-2023-10-05 targets: ${{ matrix.settings.target }} - name: Cache cargo uses: actions/cache@v3 From 56374236d5540c5684a1d0ede6eab047dbe0c9bd Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 6 Oct 2023 15:50:46 +0200 Subject: [PATCH 5/6] Update build-and-tests.yml --- .github/workflows/build-and-tests.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml index 27bc7ed76cf..03b24f06aa5 100644 --- a/.github/workflows/build-and-tests.yml +++ b/.github/workflows/build-and-tests.yml @@ -59,7 +59,7 @@ jobs: target: x86_64-pc-windows-msvc name: wasm is-wasm-build: true - build: |- + build: >- set -e && rustup target add wasm32-unknown-unknown && npm run build:wasm @@ -70,7 +70,7 @@ jobs: target: x86_64-pc-windows-msvc name: wasm-node is-wasm-build: true - build: |- + build: >- set -e && rustup target add wasm32-unknown-unknown && npm run build:wasm:node @@ -79,7 +79,7 @@ jobs: .empty - host: macos-latest target: x86_64-apple-darwin - build: | + build: >- set -e && npm run build:napi -- --release && strip -x *.node @@ -87,7 +87,7 @@ jobs: build: npm run build:napi -- --release target: x86_64-pc-windows-msvc - host: windows-latest - build: | + build: >- set -e && rustup target add i686-pc-windows-msvc && npm run build:napi -- --release --target i686-pc-windows-msvc @@ -95,7 +95,7 @@ jobs: - host: ubuntu-latest target: x86_64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian - build: |- + build: >- set -e && rustup target add x86_64-unknown-linux-gnu && npm run build:napi -- --release --target x86_64-unknown-linux-gnu && @@ -103,12 +103,12 @@ jobs: - host: ubuntu-latest target: x86_64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine - build: |- + build: >- set -e && npm run build:napi -- --release && strip *.node - host: macos-latest target: aarch64-apple-darwin - build: | + build: >- set -e && rustup target add aarch64-apple-darwin && npm run build:napi -- --release --target aarch64-apple-darwin && @@ -116,7 +116,7 @@ jobs: - host: ubuntu-latest target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 - build: |- + build: >- set -e && export JEMALLOC_SYS_WITH_LG_PAGE=16 && rustup target add aarch64-unknown-linux-gnu && @@ -128,19 +128,19 @@ jobs: setup: | sudo apt-get update sudo apt-get install gcc-arm-linux-gnueabihf -y - build: | + build: >- set -e && npm run build:napi -- --release --target armv7-unknown-linux-gnueabihf && arm-linux-gnueabihf-strip *.node - host: ubuntu-latest target: aarch64-linux-android - build: | + build: >- set -e && npm run build:napi -- --release --target aarch64-linux-android && ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node - host: ubuntu-latest target: armv7-linux-androideabi - build: | + build: >- set -e && npm run build:napi -- --release --target armv7-linux-androideabi && ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node From 368ca2de88355296aed61d5a85c8eadf71e2a984 Mon Sep 17 00:00:00 2001 From: cijiugechu Date: Fri, 6 Oct 2023 22:33:01 +0800 Subject: [PATCH 6/6] specify default toolchain for docker builds --- .github/workflows/build-and-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml index 03b24f06aa5..661462e1d76 100644 --- a/.github/workflows/build-and-tests.yml +++ b/.github/workflows/build-and-tests.yml @@ -119,6 +119,7 @@ jobs: build: >- set -e && export JEMALLOC_SYS_WITH_LG_PAGE=16 && + rustup default nightly-2023-10-05 && rustup target add aarch64-unknown-linux-gnu && npm run build:napi -- --release --target aarch64-unknown-linux-gnu && aarch64-unknown-linux-gnu-strip *.node @@ -150,6 +151,7 @@ jobs: build: >- set -e && export JEMALLOC_SYS_WITH_LG_PAGE=16 && + rustup default nightly-2023-10-05 && rustup target add aarch64-unknown-linux-musl && RUSTFLAGS='-C target-feature=-crt-static -C linker=aarch64-linux-musl-gcc' npm run build:napi -- --release --target aarch64-unknown-linux-musl && /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node