Browse Source

fix: ci hang

Tienson Qin 5 months ago
parent
commit
f4e5755c78
4 changed files with 689 additions and 722 deletions
  1. 2 2
      .github/workflows/build-desktop-release.yml
  2. 9 9
      resources/package.json
  3. 339 343
      static/yarn.lock
  4. 339 368
      yarn.lock

+ 2 - 2
.github/workflows/build-desktop-release.yml

@@ -445,7 +445,7 @@ jobs:
       #     key: ${{ runner.os }}-node-modules
 
       - name: Build/Release Electron App for x64
-        run: yarn install && yarn electron:make
+        run: yarn install && yarn rebuild:all && yarn electron:make
         working-directory: ./static
         env:
           APPLE_ID: ${{ secrets.APPLE_ID_EMAIL }}
@@ -518,7 +518,7 @@ jobs:
       #     key: ${{ runner.os }}-node-modules
 
       - name: Fetch deps and fix dugit arch for arm64
-        run: yarn install --ignore-platform && cd node_modules/dugite && npm_config_arch=arm64 node script/download-git.js
+        run: yarn install --ignore-platform && yarn rebuild:all && cd node_modules/dugite && npm_config_arch=arm64 node script/download-git.js
         working-directory: ./static
 
       - name: Build/Release Electron App for arm64

+ 9 - 9
resources/package.json

@@ -47,16 +47,16 @@
     "update-electron-app": "2.0.1"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.3.1",
-    "@electron-forge/maker-deb": "^7.3.1",
-    "@electron-forge/maker-dmg": "^7.3.1",
-    "@electron-forge/maker-wix": "^7.3.1",
-    "@electron-forge/maker-rpm": "^7.3.1",
-    "@electron-forge/maker-squirrel": "^7.3.1",
-    "@electron-forge/maker-zip": "^7.3.1",
-    "@electron/rebuild": "3.2.10",
+    "@electron-forge/cli": "^7.8.0",
+    "@electron-forge/maker-deb": "^7.8.0",
+    "@electron-forge/maker-dmg": "^7.8.0",
+    "@electron-forge/maker-wix": "^7.8.0",
+    "@electron-forge/maker-rpm": "^7.8.0",
+    "@electron-forge/maker-squirrel": "^7.8.0",
+    "@electron-forge/maker-zip": "^7.8.0",
+    "@electron/rebuild": "3.7.2",
     "electron": "35.2.2",
-    "electron-builder": "25.1.8",
+    "electron-builder": "26.0.12",
     "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git"
   },
   "resolutions": {

File diff suppressed because it is too large
+ 339 - 343
static/yarn.lock


File diff suppressed because it is too large
+ 339 - 368
yarn.lock


Some files were not shown because too many files changed in this diff