From 7e6e7b107e40b7ca2192f6c04f668a526fc2db35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= <kdy1997.dev@gmail.com>
Date: Fri, 6 Jan 2023 08:43:32 +0900
Subject: [PATCH] chore(ci): Fix publish action (#6757)

Co-authored-by: LongYinan <lynweklm@gmail.com>
---
 .github/workflows/publish-node.yml | 10 +++++++---
 package.json                       |  2 +-
 yarn.lock                          | 10 +++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish-node.yml b/.github/workflows/publish-node.yml
index 9879bdb7a99a..5a9352796a53 100644
--- a/.github/workflows/publish-node.yml
+++ b/.github/workflows/publish-node.yml
@@ -100,12 +100,12 @@ jobs:
             setup: |
               sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
+            # Use napi to build cli binary here to use zig as linker
             build: |
               export DISABLE_PLUGIN_E2E_TESTS=true
-              cargo build --manifest-path ./bindings/swc_cli/Cargo.toml --release --target=armv7-unknown-linux-gnueabihf
-              cp ./bindings/target/armv7-unknown-linux-gnueabihf/release/swc .
+              yarn napi build --bin swc --release --target armv7-unknown-linux-gnueabihf --cargo-cwd ./bindings/swc_cli --cargo-name swc --zig --zig-link-only
               chmod +x ./swc
-              yarn build --target=armv7-unknown-linux-gnueabihf --cargo-flags='--no-default-features --features swc_v1'
+              yarn build --target armv7-unknown-linux-gnueabihf --cargo-flags='--no-default-features --features swc_v1'
               arm-linux-gnueabihf-strip swc.linux-arm-gnueabihf.node
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
@@ -157,6 +157,10 @@ jobs:
           profile: minimal
           override: true
           target: ${{ matrix.settings.target }}
+      - uses: goto-bus-stop/setup-zig@v2
+        if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
+        with:
+          version: 0.10.0
       - name: Install node dependencies
         shell: bash
         run: |
diff --git a/package.json b/package.json
index a9a482054ece..8f320dc00104 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "@babel/preset-react": "^7.13.13",
         "@babel/preset-typescript": "^7.13.0",
         "@babel/types": "^7.14.0",
-        "@napi-rs/cli": "^2.13.3",
+        "@napi-rs/cli": "^2.14.1",
         "@swc/core": "=1.2.220",
         "@swc/helpers": "^0.4.2",
         "@swc/plugin-jest": "1.5.25",
diff --git a/yarn.lock b/yarn.lock
index 9ebf5ed015c0..bbbffce152df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2124,12 +2124,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@napi-rs/cli@npm:^2.13.3":
-  version: 2.13.3
-  resolution: "@napi-rs/cli@npm:2.13.3"
+"@napi-rs/cli@npm:^2.14.1":
+  version: 2.14.1
+  resolution: "@napi-rs/cli@npm:2.14.1"
   bin:
     napi: scripts/index.js
-  checksum: b16c3b307927b68adfe378bd76153b75c4a1a9d4101d7c49e0b1b9d425ce0f63a6d18acb9548d210dd90a4244333666f839d3f27070d3a07d63fa8ae1bfe2f35
+  checksum: ac93f7ce67b9b5ab839fadc7afbaa0a33126325807578133df016ed9d88455f403e7ceb9f225d2996d65e4a9d67960516533bab155a47998192f42febe35de24
   languageName: node
   linkType: hard
 
@@ -2450,7 +2450,7 @@ __metadata:
     "@babel/preset-react": ^7.13.13
     "@babel/preset-typescript": ^7.13.0
     "@babel/types": ^7.14.0
-    "@napi-rs/cli": ^2.13.3
+    "@napi-rs/cli": ^2.14.1
     "@swc/core": =1.2.220
     "@swc/core-darwin-arm64": 1.2.146
     "@swc/core-darwin-x64": 1.2.146