From 64bed9af13871034d0cf1b623fc77e4d0835b282 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Mon, 20 Jan 2025 11:40:24 +0800 Subject: [PATCH] ci: fix s390x and ppc64le test (#2435) --- .github/workflows/test-release.yaml | 34 ++++++++++------------------- cli/package.json | 2 +- yarn.lock | 22 +++++++++---------- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml index 7312bf6d..9a9b8e03 100644 --- a/.github/workflows/test-release.yaml +++ b/.github/workflows/test-release.yaml @@ -170,7 +170,7 @@ jobs: uses: actions/setup-node@v4 if: matrix.settings.target == 'i686-pc-windows-msvc' with: - node-version: 20 + node-version: 22 architecture: 'x86' - name: Unit tests @@ -297,13 +297,9 @@ jobs: matrix: settings: - target: powerpc64le-unknown-linux-gnu - setup: | - sudo apt-get update - sudo apt-get install -y gcc-powerpc64le-linux-gnu - target: s390x-unknown-linux-gnu - setup: | - sudo apt-get update - sudo apt-get install -y gcc-s390x-linux-gnu + - target: x86_64-unknown-linux-gnu + - target: aarch64-unknown-linux-gnu steps: - uses: actions/checkout@v4 @@ -311,7 +307,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: 'yarn' - name: Install @@ -327,16 +323,14 @@ jobs: ~/.cargo/registry ~/.cargo/git target + ~/.napi-rs key: stable-ubuntu-latest-${{ matrix.settings.target }}-cargo-cache - - name: Setup toolchain - run: ${{ matrix.settings.setup }} - - name: Install dependencies run: yarn install --immutable --mode=skip-build - name: Cross build native tests - run: yarn build:test -- --target ${{ matrix.settings.target }} --release + run: yarn build:test -- --target ${{ matrix.settings.target }} --release --use-napi-cross shell: bash - uses: actions/upload-artifact@v4 @@ -361,12 +355,6 @@ jobs: arch: 'x64' - image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine target: aarch64-unknown-linux-musl - - image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 - target: aarch64-unknown-linux-gnu - arch: 'arm64' - libc: 'gnu' - - image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian - target: x86_64-unknown-linux-gnu steps: - uses: actions/checkout@v4 @@ -374,7 +362,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: 'yarn' - name: Install dependencies @@ -420,7 +408,7 @@ jobs: strategy: fail-fast: false matrix: - node: [18, 20] + node: [18, 20, 22] settings: - image: 'node:{:version}-slim' target: x86_64-unknown-linux-gnu @@ -462,7 +450,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: 'yarn' - uses: actions/download-artifact@v4 with: @@ -499,7 +487,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: 'yarn' - name: Install @@ -515,7 +503,7 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: stable-linux-armv7-gnueabihf-node@20-cargo-cache + key: stable-linux-armv7-gnueabihf-node@22-cargo-cache - name: Install dependencies run: | diff --git a/cli/package.json b/cli/package.json index 0fb58d23..4437ed2f 100644 --- a/cli/package.json +++ b/cli/package.json @@ -68,7 +68,7 @@ }, "dependencies": { "@inquirer/prompts": "^7.0.0", - "@napi-rs/cross-toolchain": "^0.0.18", + "@napi-rs/cross-toolchain": "^0.0.19", "@napi-rs/wasm-tools": "^0.0.2", "@octokit/rest": "^21.0.2", "clipanion": "^3.2.1", diff --git a/yarn.lock b/yarn.lock index 0e216594..94a180a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -808,7 +808,7 @@ __metadata: "@emnapi/core": "npm:^1.3.1" "@emnapi/runtime": "npm:^1.3.1" "@inquirer/prompts": "npm:^7.0.0" - "@napi-rs/cross-toolchain": "npm:^0.0.18" + "@napi-rs/cross-toolchain": "npm:^0.0.19" "@napi-rs/wasm-tools": "npm:^0.0.2" "@octokit/rest": "npm:^21.0.2" "@types/debug": "npm:^4.1.12" @@ -848,20 +848,20 @@ __metadata: languageName: unknown linkType: soft -"@napi-rs/cross-toolchain@npm:^0.0.18": - version: 0.0.18 - resolution: "@napi-rs/cross-toolchain@npm:0.0.18" +"@napi-rs/cross-toolchain@npm:^0.0.19": + version: 0.0.19 + resolution: "@napi-rs/cross-toolchain@npm:0.0.19" dependencies: "@napi-rs/lzma": "npm:^1.4.1" "@napi-rs/tar": "npm:^0.1.4" debug: "npm:^4.4.0" peerDependencies: - "@napi-rs/cross-toolchain-arm64-target-aarch64": ^0.0.18 - "@napi-rs/cross-toolchain-arm64-target-armv7": ^0.0.18 - "@napi-rs/cross-toolchain-arm64-target-x86_64": ^0.0.18 - "@napi-rs/cross-toolchain-x64-target-aarch64": ^0.0.18 - "@napi-rs/cross-toolchain-x64-target-armv7": ^0.0.18 - "@napi-rs/cross-toolchain-x64-target-x86_64": ^0.0.18 + "@napi-rs/cross-toolchain-arm64-target-aarch64": ^0.0.19 + "@napi-rs/cross-toolchain-arm64-target-armv7": ^0.0.19 + "@napi-rs/cross-toolchain-arm64-target-x86_64": ^0.0.19 + "@napi-rs/cross-toolchain-x64-target-aarch64": ^0.0.19 + "@napi-rs/cross-toolchain-x64-target-armv7": ^0.0.19 + "@napi-rs/cross-toolchain-x64-target-x86_64": ^0.0.19 peerDependenciesMeta: "@napi-rs/cross-toolchain-arm64-target-aarch64": optional: true @@ -875,7 +875,7 @@ __metadata: optional: true "@napi-rs/cross-toolchain-x64-target-x86_64": optional: true - checksum: 10c0/0c1cd4f1ee23d0e3a93a9dfe26dfe95679a7f1b42cc33e2741a68c35c0fb4793ae4b474507439c411df509d36315b168f482228f20bf027704baa4c6692c35e8 + checksum: 10c0/6084567d9d86a818bf600d354aefa88aebad6bd0d76de3e41b50b652dc47cdb2056e7482a68870665ecc9e74dd67fcf9fbc9c02057cec9aa17510b4adbabb326 languageName: node linkType: hard