From b3bb29ed9b56d7875481eca1000020138d85effe Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 30 Nov 2023 14:34:29 +0800 Subject: [PATCH 1/5] fix: update toolchain in ci workflow --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14074c0..d00c5ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: uses: dtolnay/rust-toolchain@stable if: ${{ !matrix.settings.docker }} with: - toolchain: nightly-2023-06-02 + toolchain: nightly-2023-10-24 targets: ${{ matrix.settings.target }} - name: Cache cargo From 7e9e942071635d78f830a85889cb6b8670a3105b Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 30 Nov 2023 14:36:07 +0800 Subject: [PATCH 2/5] fix: cache target --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5f8002..4c21e39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: - name: Install Rust Toolchain uses: ./.github/actions/rustup with: - save-cache: ${{ github.ref_name == 'main' }} + save-cache: ${{ github.ref_name == 'master' }} shared-key: check # Compile test without debug info for reducing the CI cache size From a2482135a729c3780d8a8a9cc21e8a76bdd7a052 Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 30 Nov 2023 14:38:43 +0800 Subject: [PATCH 3/5] chore: test publish --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d00c5ac..86f6857 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ permissions: on: push: branches: - - master + - fix/ci tags-ignore: - '**' paths-ignore: From f6059f566796c3e9ad5843f14bb5bd2153a9df5e Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 30 Nov 2023 15:13:23 +0800 Subject: [PATCH 4/5] fix: remove universal build --- .github/workflows/release.yml | 29 +---------------------------- crates/node_binding/package.json | 1 - 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86f6857..0609105 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,38 +105,11 @@ jobs: name: bindings-${{ matrix.settings.target }} path: crates/node_binding/${{ env.APP_NAME }}.*.node if-no-files-found: error - universal-macOS: - name: Build universal macOS binary - needs: - - build - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - name: Pnpm Cache # Required by some tests - uses: ./.github/actions/pnpm-cache - - name: Download macOS x64 artifact - uses: actions/download-artifact@v3 - with: - name: bindings-x86_64-apple-darwin - path: crates/node_binding/ - - name: Download macOS arm64 artifact - uses: actions/download-artifact@v3 - with: - name: bindings-aarch64-apple-darwin - path: crates/node_binding/ - - name: Combine binaries - run: cd crates/node_binding && pnpm universal - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: bindings-universal-apple-darwin - path: crates/node_binding/${{ env.APP_NAME }}.*.node - if-no-files-found: error publish: name: Publish runs-on: ubuntu-latest needs: - - universal-macOS + - build steps: - uses: actions/checkout@v4 - name: Pnpm Cache # Required by some tests diff --git a/crates/node_binding/package.json b/crates/node_binding/package.json index 70ddf23..0f12da4 100644 --- a/crates/node_binding/package.json +++ b/crates/node_binding/package.json @@ -27,7 +27,6 @@ "build:debug": "napi build --platform", "build:debug:aarch64": "napi build --platform --target aarch64-apple-darwin", "prepublishOnly": "napi prepublish -t npm", - "universal": "napi universal", "version": "napi version" } } \ No newline at end of file From d7079e97a04c883cde98a6215423762aec27d52a Mon Sep 17 00:00:00 2001 From: ClarkXia Date: Thu, 30 Nov 2023 15:32:19 +0800 Subject: [PATCH 5/5] fix: ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0609105..a21c1b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ permissions: on: push: branches: - - fix/ci + - master tags-ignore: - '**' paths-ignore: