Update build process to include separate build steps for macOS, Linux…

…, and Windows
Thavarshan · Sep 2, 2024 · 43dd778 · 43dd778
1 parent 3bed608
commit 43dd778
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -140,45 +140,48 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
       - name: Download build artifacts (macos x64)
         uses: actions/download-artifact@v3
         with:
           name: build-artifacts-macos-x64
-          path: make
+          path: artifacts
 
       - name: Download build artifacts (macos arm64)
         uses: actions/download-artifact@v3
         with:
           name: build-artifacts-macos-arm64
-          path: make
+          path: artifacts
 
       - name: Download build artifacts (linux x64)
         uses: actions/download-artifact@v3
         with:
           name: build-artifacts-linux-x64
-          path: make
+          path: artifacts
 
       - name: Download build artifacts (linux arm64)
         uses: actions/download-artifact@v3
         with:
           name: build-artifacts-linux-arm64
-          path: make
+          path: artifacts
 
       - name: Download build artifacts (windows x64)
         uses: actions/download-artifact@v3
         with:
           name: build-artifacts-windows-x64
-          path: make
+          path: artifacts
 
       - name: Download build artifacts (windows arm64)
         uses: actions/download-artifact@v3
         with:
           name: build-artifacts-windows-arm64
-          path: make
+          path: artifacts
 
       - name: Upload files to Cloudflare R2
         run: |
-          for file in $(find make/ -type f); do
+          for file in $(find artifacts/ -type f -name 'comet*' -o -name 'Comet*'); 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

diff --git a/forge.config.ts b/forge.config.ts
@@ -44,8 +44,9 @@ const config: ForgeConfig = {
     {
       name: '@electron-forge/maker-appx',
       platforms: ['win32'],
-      config: {
-        packageName: 'JeromeThayananthajothy.Comet',
+      config: (arch: string) => ({
+        packageName: `JeromeThayananthajothy.Comet`,
+        packageExecutable: `Comet-${version}-win32-${arch}`,
         packageDisplayName: 'Comet',
         packageDescription: 'A simple video converter',
         packageVersion: `${version}.1`,
@@ -54,7 +55,7 @@ const config: ForgeConfig = {
         certPass: process.env.CERT_PASSWORD,
         windowsKit: process.env.WINDOWS_KIT_PATH,
         icon: path.resolve(iconDir, 'icon.ico')
-      },
+      }),
     },
     {
       name: '@electron-forge/maker-zip',