From 0edf9d7e8c3f4b8261704886fd0eac889f5c8f4b Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 16:47:50 -0500 Subject: [PATCH 1/8] Fix swc build for freebsd target --- .github/workflows/build_test_deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 9293ce558a4e..a07daae77ce6 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1493,8 +1493,8 @@ jobs: whoami env freebsd-version - npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" && if [ ! -f $(dirname $(which yarn))/pnpm ]; then ln -s $(which yarn) $(dirname $(which yarn))/pnpm;fi - yarn --cwd=packages/next-swc build-native-no-plugin --release --target x86_64-unknown-freebsd + npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" + cd packages/next-swc && npm run build-native-no-plugin -- --release --target x86_64-unknown-freebsd rm -rf node_modules rm -rf packages/next-swc/target - name: Upload artifact From 0e60669371481d3d766a770d7731c76fc3484ed9 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 16:48:06 -0500 Subject: [PATCH 2/8] test build --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index a07daae77ce6..c3e6b0994656 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1445,7 +1445,7 @@ jobs: path: packages/next-swc/native/next-swc.*.node build-native-freebsd: - if: ${{ needs.build.outputs.isRelease == 'true' }} + # if: ${{ needs.build.outputs.isRelease == 'true' }} needs: build name: stable - x86_64-unknown-freebsd - node@16 runs-on: macos-12 From 9c4a670484a72dd4766e7543b0dd23d189f1cfcd Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 17:07:36 -0500 Subject: [PATCH 3/8] update build --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index c3e6b0994656..baf9b150fca3 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1493,7 +1493,7 @@ jobs: whoami env freebsd-version - npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" + npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" cd packages/next-swc && npm run build-native-no-plugin -- --release --target x86_64-unknown-freebsd rm -rf node_modules rm -rf packages/next-swc/target From de04933482161e19b4f389cc3992c2b190860dad Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 17:20:24 -0500 Subject: [PATCH 4/8] update version --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index baf9b150fca3..91ce32dd4a17 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1463,7 +1463,7 @@ jobs: rm -rf test - name: Build id: build - uses: vmactions/freebsd-vm@v0.2.0 + uses: vmactions/freebsd-vm@v0.2.3 env: DEBUG: napi:* RUSTUP_HOME: /usr/local/rustup From c931de3dbd911a4cbecfb554444f6414d46548f9 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 17:30:41 -0500 Subject: [PATCH 5/8] test v0 --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 91ce32dd4a17..19664af4706b 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1463,7 +1463,7 @@ jobs: rm -rf test - name: Build id: build - uses: vmactions/freebsd-vm@v0.2.3 + uses: vmactions/freebsd-vm@v0 env: DEBUG: napi:* RUSTUP_HOME: /usr/local/rustup From 832ea9183ace5d43dce92c0c5ddc8b27f974c0ef Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 17:44:00 -0500 Subject: [PATCH 6/8] use napi directly --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 19664af4706b..a02c4a6a3433 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1494,7 +1494,7 @@ jobs: env freebsd-version npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" - cd packages/next-swc && npm run build-native-no-plugin -- --release --target x86_64-unknown-freebsd + cd packages/next-swc && napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --release --target x86_64-unknown-freebsd rm -rf node_modules rm -rf packages/next-swc/target - name: Upload artifact From 4727d9c4e19a3cb8e206d60c87c26555cd8fbe61 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 17:55:09 -0500 Subject: [PATCH 7/8] revert vm version --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index a02c4a6a3433..9ed7d71e457a 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1463,7 +1463,7 @@ jobs: rm -rf test - name: Build id: build - uses: vmactions/freebsd-vm@v0 + uses: vmactions/freebsd-vm@v0.2.3 env: DEBUG: napi:* RUSTUP_HOME: /usr/local/rustup From 1aa9c90436f31a849fe6ed912e44d9b07a6b5daf Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 10 Aug 2022 18:07:41 -0500 Subject: [PATCH 8/8] undo test build --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 9ed7d71e457a..1537037ceab9 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -1445,7 +1445,7 @@ jobs: path: packages/next-swc/native/next-swc.*.node build-native-freebsd: - # if: ${{ needs.build.outputs.isRelease == 'true' }} + if: ${{ needs.build.outputs.isRelease == 'true' }} needs: build name: stable - x86_64-unknown-freebsd - node@16 runs-on: macos-12