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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14074c0..a21c1b0 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 @@ -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