feat: update electron-builder and ci runner images

bitfocus · Dec 7, 2024 · 7e37f6f · 7e37f6f
1 parent 2bce28b
commit 7e37f6f
Show file tree

Hide file tree

Showing 6 changed files with 748 additions and 191 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -42,7 +42,7 @@ jobs:
           yarn check-types
 
   linux-x64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: check-types
     timeout-minutes: 20
 
@@ -96,6 +96,12 @@ jobs:
           echo "targetname=companion-linux-x64-${VERSION}.tar.gz" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.filenames.outputs.targetname }}
+          path: ${{ steps.filenames.outputs.sourcename }}
+          retention-days: 1
       - name: Upload build
         id: upload
         uses: bitfocus/actions/upload-and-notify@main
@@ -116,7 +122,7 @@ jobs:
           api-secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
 
   linux-arm64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: check-types
     timeout-minutes: 20
 
@@ -167,6 +173,12 @@ jobs:
           echo "targetname=companion-linux-arm64-${VERSION}.tar.gz" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.filenames.outputs.targetname }}
+          path: ${{ steps.filenames.outputs.sourcename }}
+          retention-days: 1
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:
@@ -186,7 +198,7 @@ jobs:
           api-secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
 
   osx-x64:
-    runs-on: macos-13
+    runs-on: macos-latest
     needs: check-types
     timeout-minutes: 60
 
@@ -220,9 +232,9 @@ jobs:
           CI: 1
           CSC_LINK: ${{ secrets.OSX_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.OSX_CSC_KEY_PASSWORD }}
-          APPLEID: ${{ secrets.APPLEID }}
-          APPLETEAMID: ${{ secrets.APPLETEAMID }}
-          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          APPLE_ID: ${{ secrets.APPLEID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLETEAMID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           USE_HARD_LINKS: false
 
@@ -236,6 +248,12 @@ jobs:
           echo "targetname=companion-mac-x64-${VERSION}.dmg" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.filenames.outputs.targetname }}
+          path: ${{ steps.filenames.outputs.sourcename }}
+          retention-days: 1
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:
@@ -255,7 +273,7 @@ jobs:
           api-secret: ${{ secrets.BITFOCUS_API_PROJECT_SECRET }}
 
   osx-arm64:
-    runs-on: macos-13
+    runs-on: macos-latest
     needs: check-types
     timeout-minutes: 60
 
@@ -292,9 +310,9 @@ jobs:
           CI: 1
           CSC_LINK: ${{ secrets.OSX_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.OSX_CSC_KEY_PASSWORD }}
-          APPLEID: ${{ secrets.APPLEID }}
-          APPLETEAMID: ${{ secrets.APPLETEAMID }}
-          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          APPLE_ID: ${{ secrets.APPLEID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLETEAMID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           USE_HARD_LINKS: false
           SKIP_LAUNCH_CHECK: true
@@ -309,6 +327,12 @@ jobs:
           echo "targetname=companion-mac-arm64-${VERSION}.dmg" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.filenames.outputs.targetname }}
+          path: ${{ steps.filenames.outputs.sourcename }}
+          retention-days: 1
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:
@@ -376,6 +400,12 @@ jobs:
           echo "targetname=companion-win64-${VERSION}.exe" >> $GITHUB_OUTPUT
           echo "longversion=${VERSION}" >> $GITHUB_OUTPUT
 
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.filenames.outputs.targetname }}
+          path: ${{ steps.filenames.outputs.sourcename }}
+          retention-days: 1
       - name: Upload build
         uses: bitfocus/actions/upload-and-notify@main
         with:

diff --git a/.yarn/patches/app-builder-lib-npm-26.0.0-alpha.7-e1b3dca119.patch b/.yarn/patches/app-builder-lib-npm-26.0.0-alpha.7-e1b3dca119.patch
@@ -0,0 +1,15 @@
+diff --git a/out/util/filter.js b/out/util/filter.js
+index 369783eff5c64c342831dd3544c3f51e490b0e93..299448962c25c63cfcbc891de22fcb7d5f67c80e 100644
+--- a/out/util/filter.js
++++ b/out/util/filter.js
+@@ -41,7 +41,9 @@ function createFilter(src, patterns, excludePatterns) {
+         let relative = getRelativePath(file, srcWithEndSlash, stat);
+         // filter the root node_modules, but not a subnode_modules (like /appDir/others/foo/node_modules/blah)
+         if (relative === "node_modules") {
+-            return false;
++            // return false;
++            // HACK: we want the root node_modules
++            return true
+         }
+         else if (relative.endsWith("/node_modules")) {
+             relative += "/";
diff --git a/launcher/notarize.cjs b/launcher/notarize.cjs
diff --git a/launcher/package.json b/launcher/package.json
@@ -25,10 +25,9 @@
 		"systeminformation": "^5.23.5"
 	},
 	"devDependencies": {
-		"@electron/notarize": "^2.5.0",
 		"@types/plist": "^3.0.5",
 		"electron": "33.2.1",
-		"electron-builder": "24.13.3",
+		"electron-builder": "26.0.0-alpha.7",
 		"electron-reloader": "^1.2.3"
 	},
 	"build": {
@@ -53,7 +52,6 @@
 			"entitlementsInherit": "entitlements.mac.plist"
 		},
 		"afterPack": "fix-bundled-modules.cjs",
-		"afterSign": "notarize.cjs",
 		"win": {
 			"target": "nsis"
 		},
@@ -91,7 +89,11 @@
 		"extraResources": [
 			{
 				"from": "../dist",
-				"to": "."
+				"to": ".",
+				"filter": [
+					"**/*",
+					"!.yarn"
+				]
 			}
 		]
 	}

diff --git a/package.json b/package.json
@@ -49,9 +49,9 @@
     "zx": "^8.2.4"
   },
   "resolutions": {
-    "app-builder-bin": "npm:@julusian/[email protected]",
     "node-gyp-build": "github:julusian/node-gyp-build#cross-install-support",
     "osc/serialport": "^12.0.0",
-    "react-select": "npm:@julusian/react-select@^5.8.1-3"
+    "react-select": "npm:@julusian/react-select@^5.8.1-3",
+    "app-builder-lib@npm:26.0.0-alpha.7": "patch:app-builder-lib@npm%3A26.0.0-alpha.7#~/.yarn/patches/app-builder-lib-npm-26.0.0-alpha.7-e1b3dca119.patch"
   }
 }