From 220a548f57cd56ae9625b9427301fe627d6e9f08 Mon Sep 17 00:00:00 2001 From: Diego Reis Date: Fri, 25 Jul 2025 13:29:58 -0300 Subject: [PATCH] workflow: Fix macOS universal binary build --- .github/workflows/napi.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/napi.yml b/.github/workflows/napi.yml index 3a93a1387..145fd4f84 100644 --- a/.github/workflows/napi.yml +++ b/.github/workflows/napi.yml @@ -13,7 +13,7 @@ on: env: DEBUG: napi:* APP_NAME: turso - MACOSX_DEPLOYMENT_TARGET: '10.13' + MACOSX_DEPLOYMENT_TARGET: "10.13" defaults: run: @@ -87,7 +87,7 @@ jobs: if: ${{ matrix.settings.docker }} with: image: ${{ matrix.settings.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/bindings/javascript' + 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/bindings/javascript" run: ${{ matrix.settings.build }} - name: Build run: ${{ matrix.settings.build }} @@ -110,7 +110,7 @@ jobs: - host: macos-13 target: x86_64-apple-darwin node: - - '20' + - "20" runs-on: ${{ matrix.settings.host }} steps: - uses: actions/checkout@v4 @@ -139,7 +139,7 @@ jobs: fail-fast: false matrix: node: - - '20' + - "20" runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - uses: actions/checkout@v4 @@ -176,12 +176,15 @@ jobs: uses: actions/download-artifact@v4 with: name: bindings-x86_64-apple-darwin - path: bindings/javascript/artifacts + path: bindings/javascript - name: Download macOS arm64 artifact uses: actions/download-artifact@v4 with: name: bindings-aarch64-apple-darwin - path: bindings/javascript/artifacts + path: bindings/javascript + - name: List packages + run: ls -R . + shell: bash - name: Combine binaries run: yarn universal - name: Upload artifact