update build process

jigsawye · Nov 10, 2024 · 14f196d · 14f196d
1 parent b4e4a8b
commit 14f196d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,18 +56,17 @@ jobs:
       - name: Prepare package
         shell: bash
         run: |
-          mkdir -p npm/@swagit/${{ matrix.name }}/bin
           if [ "${{ matrix.name }}" = "win32-x64" ]; then
-            cp target/${{ matrix.target }}/release/swagit.exe npm/@swagit/${{ matrix.name }}/bin/
+            cp build/target/${{ matrix.target }}/release/swagit.exe packages/${{ matrix.name }}/bin
           else
-            cp target/${{ matrix.target }}/release/swagit npm/@swagit/${{ matrix.name }}/bin/
+            cp build/target/${{ matrix.target }}/release/swagit packages/${{ matrix.name }}/bin
           fi
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}
-          path: npm/@swagit/${{ matrix.name }}
+          path: packages/${{ matrix.name }}/bin
           compression-level: 0
 
   release:

diff --git a/packages/darwin-arm64/package.json b/packages/darwin-arm64/package.json
@@ -8,7 +8,7 @@
     "arm64"
   ],
   "files": [
-    "sg"
+    "bin"
   ],
   "description": "macOS ARM64 binary for swagit"
 }
diff --git a/packages/darwin-x64/package.json b/packages/darwin-x64/package.json
@@ -8,7 +8,7 @@
     "x64"
   ],
   "files": [
-    "sg"
+    "bin"
   ],
   "description": "macOS x64 binary for swagit"
 }
diff --git a/packages/linux-arm64/package.json b/packages/linux-arm64/package.json
@@ -8,7 +8,7 @@
     "arm64"
   ],
   "files": [
-    "sg"
+    "bin"
   ],
   "description": "Linux ARM64 binary for swagit"
 }
diff --git a/packages/linux-x64/package.json b/packages/linux-x64/package.json
@@ -8,7 +8,7 @@
     "x64"
   ],
   "files": [
-    "sg"
+    "bin"
   ],
   "description": "Linux x64 binary for swagit"
 }
diff --git a/packages/swagit/bin/swagit.js b/packages/swagit/bin/swagit.js
@@ -16,7 +16,9 @@ function getBinaryPath() {
     throw new Error(`Unsupported platform: ${platform_arch}`);
   }
 
-  return require.resolve(binary_path);
+  const sub_path = platform === 'win32' ? 'swagit.exe' : 'swagit';
+
+  return require.resolve(`${binary_path}/bin/${sub_path}`);
 }
 
 require('child_process')

diff --git a/packages/win32-x64/package.json b/packages/win32-x64/package.json
@@ -8,7 +8,7 @@
     "x64"
   ],
   "files": [
-    "sg.exe"
+    "bin"
   ],
   "description": "Windows x64 binary for swagit"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
         "arm64"
       ],
       "files": [
-        "sg"
+        "bin"
       ],
       "description": "macOS ARM64 binary for swagit"
     }