fix: windows rebuild native

opensumi · Mar 6, 2022 · e5c5955 · e5c5955
1 parent 0a705af
commit e5c5955
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 53 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,44 +3,11 @@ name: RELEASE
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
   workflow_dispatch:
 
 jobs:
-  windows-build:
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        node_version: [14.x]
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Package Electron
-        run: |
-          npm i
-          npm run rebuild-native
-          npm run pack
-        env:
-          TARGET_PLATFORMS: win32
-
-
-      - uses: 'marvinpinto/action-automatic-releases@latest'
-        with:
-          repo_token: '${{ secrets.GITHUB_TOKEN }}'
-          prerelease: true
-          files: |
-            LICENSE
-            out/*.dmg
-            out/*.exe
-
-  macos-build:
+  build:
     runs-on: macos-latest
 
     strategy:
@@ -63,10 +30,9 @@ jobs:
         env:
           TARGET_PLATFORMS: darwin
 
-
-      - uses: 'marvinpinto/action-automatic-releases@latest'
+      - uses: "marvinpinto/action-automatic-releases@latest"
         with:
-          repo_token: '${{ secrets.GITHUB_TOKEN }}'
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: true
           files: |
             LICENSE

diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensumi-desktop",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "main": "main/index.js",
   "description": "OpenSumi Desktop",
   "private": true,

diff --git a/build/webpack.node.config.js b/build/webpack.node.config.js
@@ -43,7 +43,7 @@ module.exports = {
   },
   externals: [
     function (context, request, callback) {
-      if (['node-pty', 'nsfw', 'spdlog', 'vscode-ripgrep', 'vm2', 'keytar'].indexOf(request) !== -1) {
+      if (['node-pty', 'nsfw', 'spdlog', 'vscode-ripgrep', 'vm2', 'keytar', 'vertx'].indexOf(request) !== -1) {
         return callback(null, 'commonjs ' + request);
       }
       callback();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ide-electron",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "OpenSumi IDE Electron 示例项目",
   "main": "./app/main/index.js",
   "scripts": {
@@ -129,4 +129,4 @@
     "webpack": "^4.46.0",
     "webpack-cli": "^4.9.1"
   }
-}
+}
diff --git a/scripts/rebuild-native.js b/scripts/rebuild-native.js
@@ -14,6 +14,7 @@ let commands;
 
 const target = argv.target || 'node';
 const arch = argv.arch || os.arch();
+const platform = os.platform();
 let version;
 
 if (target === 'electron') {
@@ -22,17 +23,27 @@ if (target === 'electron') {
 
   console.log('rebuilding native for electron version ' + version);
 
-  commands = [
-    `npm_config_arch=${arch}`,
-    `npm_config_target_arch=${arch}`,
-    os.platform() === 'win32'
-      ? 'set HOME=~/.electron-gyp'
-      : 'HOME=~/.electron-gyp',
-
-    os.platform() === 'win32'
-      ? join(__dirname, '..\\node_modules\\.bin\\electron-rebuild.cmd')
-      : join(__dirname, '../node_modules/.bin/electron-rebuild'),
-  ];
+  if (platform === 'win32') {
+    commands = [
+      'node-gyp',
+      'rebuild',
+      '--openssl_fips=X',
+      `--target=${version}`,
+      `--arch=${arch}`,
+      '--dist-url=https://electronjs.org/headers',
+    ]
+  } else {
+    commands = [
+      `npm_config_arch=${arch}`,
+      `npm_config_target_arch=${arch}`,
+      'node-gyp',
+      'rebuild',
+      '--openssl_fips=X',
+      `--target=${version}`,
+      `--arch=${arch}`,
+      '--dist-url=https://electronjs.org/headers',
+    ];
+  }
 
 } else if (target === 'node') {