Test improved build and publish gh action

Thavarshan · Sep 2, 2024 · 04185cd · 04185cd
1 parent 70392cf
commit 04185cd
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 8 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -6,7 +6,7 @@ on:
       - release
 
 jobs:
-  build:
+  build-windows:
     runs-on: windows-latest
 
     steps:
@@ -46,7 +46,6 @@ jobs:
         npm run make
       env:
         WINDOWS_KIT_PATH: ${{ env.WINDOWS_KIT_PATH }}
-        CERT_PATH: ${{ env.CERT_PATH }}
         CERT_PASSWORD: ${{ env.CERT_PASSWORD }}
       shell: pwsh
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,8 +6,7 @@ on:
       - release
 
 jobs:
-  build-and-publish-mac-linux:
-    if: false
+  build-mac-linux:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
@@ -39,22 +38,112 @@ jobs:
           VERSION=$(node -e "console.log(require('./package.json').version);")
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts-${{ matrix.os }}-${{ matrix.arch }}
+          path: out/make/
+
+  build-windows:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20'
+
+      - name: Install Microsoft Build Tools
+        run: |
+          choco install microsoft-build-tools -y
+        shell: pwsh
+
+      - name: Verify makeappx.exe and build & sign the appx
+        run: |
+          # Verify makeappx.exe
+          $makeappxPath = 'C:\Program Files (x86)\Windows Kits\10\App Certification Kit\makeappx.exe'
+          if (Test-Path $makeappxPath) {
+            echo "makeappx.exe found at $makeappxPath"
+            $env:WINDOWS_KIT_PATH="C:\Program Files (x86)\Windows Kits\10\App Certification Kit"
+          } else {
+            Write-Error "makeappx.exe not found."
+            exit 1
+          }
+
+          # Install dependencies
+          npm install
+
+          # Provide environment variables for signing during the build
+          $env:CERT_PATH=$certPath
+          $env:CERT_PASSWORD=$certPassword
+
+          # Build and sign the appx using Electron Forge
+          npm run make
+        env:
+          WINDOWS_KIT_PATH: ${{ env.WINDOWS_KIT_PATH }}
+          CERT_PASSWORD: ${{ env.CERT_PASSWORD }}
+        shell: pwsh
+
+      - name: Extract version from package.json
+        run: |
+          $version = (node -e "console.log(require('./package.json').version);")
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts-windows
+          path: out/make/
+
+  upload-artifacts:
+    needs: [build-mac-linux, build-windows]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download build artifacts (macos-latest x64)
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts-macos-latest-x64
+
+      - name: Download build artifacts (macos-latest arm64)
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts-macos-latest-arm64
+
+      - name: Download build artifacts (ubuntu-latest x64)
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts-ubuntu-latest-x64
+
+      - name: Download build artifacts (ubuntu-latest arm64)
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts-ubuntu-latest-arm64
+
+      - name: Download build artifacts (windows)
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts-windows
+
       - name: Upload files to Cloudflare R2
         run: |
           for file in $(find out/make/ -type f); do
             echo "Uploading $(basename "$file")"
             aws s3 cp "$file" "s3://${{ secrets.R2_BUCKET }}/releases/v${{ env.VERSION }}/$(basename "$file")" \
               --endpoint-url="${{ secrets.R2_ENDPOINT }}" --debug
           done
-        shell: bash
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ secrets.R2_REGION }}
+        shell: bash
 
   create-release:
-    if: false
-    needs: [build-and-publish-mac-linux]
+    needs: [build-mac-linux, build-windows]
     runs-on: ubuntu-latest
 
     steps:

diff --git a/forge.config.ts b/forge.config.ts
@@ -54,7 +54,7 @@ const config: ForgeConfig = {
         packageVersion: `${version}.1`,
         publisher: 'CN=E0D72A6F-3D67-49D6-9EA4-99FAFB4620E5',
         devCert: path.resolve(__dirname, 'tools/certs/dev-cert.pfx'),
-        certPass: 'alpha26!',
+        certPass: process.env.CERT_PASSWORD,
         windowsKit: process.env.WINDOWS_KIT_PATH,
         icon: path.resolve(iconDir, 'icon.ico')
       },