ci: Fix make command for the different OS's

.github/workflows/workflow-package.yml

@@ -1,6 +1,6 @@
+# Workflow dispatch for packaging an electron executable
 name: 📦 Package Workflow
 
-# Workflow dispatch for packaging an electron executable
 on:
   workflow_dispatch:
     inputs:
@@ -14,98 +14,108 @@ on:
         description: Package the app for 'home' or 'clinic' use
       os:
         type: choice
-        options:
-          - "All"
-          - "Windows"
-          - "macOS"
-          - "Linux"
-        default: "All"
+        description: Which operating system to make executables for
         required: true
-        description: Which OS to package
+        default: "All"
+        options:
+          - "all"
+          - "windows"
+          - "mac-x64"
+          - "mac-arm64"
+          - "linux"
 
 jobs:
+  setup-job:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Set matrix
+        id: set-matrix
+        run: |
+          [ ${{ github.event.inputs.os }} == windows ] && matrix='["windows-latest"]'
+          [ ${{ github.event.inputs.os }} == mac-x64 ] && matrix='["macOS-13"]'
+          [ ${{ github.event.inputs.os }} == mac-arm64 ] && matrix='["macOS-latest"]'
+          [ ${{ github.event.inputs.os }} == linux ] && matrix='["ubtuntu-latest"]'
+          [ ${{ github.event.inputs.os }} == all ] && matrix='["windows-latest", "macOS-13", "macOS-latest", "ubuntu-latest"]'
+          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+
   package-and-upload:
-    name: Package and Upload
+    name: Package and Upload Installer
+    needs: setup-job
     runs-on: ${{ matrix.os }}
-
-    # Run action for [home/clinic] in [windows/macOS/ubuntu] based on user input
     strategy:
       matrix:
-        os: ${{
-          (github.event.inputs.os == 'All' && fromJSON('["ubuntu-latest", "macOS-latest", "windows-latest"]')) ||
-          (github.event.inputs.os == 'Windows' && fromJSON('["windows-latest"]')) ||
-          (github.event.inputs.os == 'macOS' && fromJSON('["macOS-latest"]')) ||
-          (github.event.inputs.os == 'Linux' && fromJSON('["ubuntu-latest"]')) }}
+        os: ${{ fromJson(needs.setup-job.outputs.matrix) }}
       fail-fast: false # A failed build will not end the other matrix jobs
 
     steps:
+      - name: Extact OS short name
+        id: os_name
+        shell: bash
+        run: |
+          [ ${{ matrix.os }} == windows-latest ] && osShortName='windows'
+          [ ${{ matrix.os }} == macOS-13 ] && osShortName='mac-x64'
+          [ ${{ matrix.os }} == macOS-latest ] && osShortName='mac-arm64'
+          [ ${{ matrix.os }} == ubuntu-latest ] && osShortName='linux'
+          echo name=$osShortName >> $GITHUB_OUTPUT
+
       # Set up runner
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
-
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
           cache: npm
       - name: 🐍 Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.12
 
-      # Install dependencies and set up environment
+      # Install dependencies
       - name: 🅿️ Install Python tools
         run: pip install setuptools
       - name: 📥 Install Dependencies
         run: npm ci
 
-        # Set up the environment
-      - name: 🔃 Load .env file (.env.${{github.event.inputs.setting}})
-        uses: xom9ikk/dotenv@v2
+      # Set up the environment
+      - name: 🔃 Load .env file - .env.${{github.event.inputs.setting}}
+        uses: xom9ikk/dotenv@v2.3.0
         with:
           path: ./env
           mode: ${{github.event.inputs.setting}}
 
-      # Package the app and make the installers
-      - name: 📦 Make app installer - Windows
-        if: startsWith(matrix.os, 'windows')
-        run: npm run make:windows
-      - name: 📦 Make app installer - Mac
-        if: startsWith(matrix.os, 'mac')
-        run: npm run make:mac
-      - name: 📦 Make app installer - Linux
-        if: startsWith(matrix.os, 'ubuntu')
-        run: npm run make:linux
+      # Make the installers
+      - name: 📦 Make app installer
+        shell: bash
+        run: npm run make:${{ steps.os_name.outputs.name }}
 
-      # Get package info
-      - name: Get package name and version
-        id: package_info
-        run: |
-          echo "name=$(cat package.json | jq -r '.name')" >> $GITHUB_OUTPUT
-          echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
+      # Extract the file's path and outfile's name
+      - name: Extract installer info
+        id: installer_info
         shell: bash
+        run: |
+          packageName=$(jq -r '.name' package.json)
+          packageVersion=$(jq -r '.version' package.json)
 
-      # Upload installers to github action
-      # TODO @brown-ccv #247: Can we use the publish command here?
-      - name: ⬆ Upload installer - Windows
-        uses: actions/upload-artifact@v3
-        if: startsWith(matrix.os, 'windows')
-        with:
-          name: ${{ format('win-installer-{0}', github.event.inputs.setting) }}
-          path: out/make/squirrel.windows/x64/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }} Setup.exe
-          if-no-files-found: error
+          name="${packageName}-${packageVersion}-${{github.event.inputs.setting}}-${{steps.os_name.outputs.name}}"
+          echo name=$name >> $GITHUB_OUTPUT
 
-      - name: ⬆ Upload installer - Mac
-        uses: actions/upload-artifact@v3
-        if: startsWith(matrix.os, 'mac')
-        with:
-          name: ${{ format('mac-installer-{0}', github.event.inputs.setting) }}
-          path: out/make/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-universal.dmg
-          if-no-files-found: error
-      - name: ⬆ Upload installer - Linux
-        uses: actions/upload-artifact@v3
-        if: startsWith(matrix.os, 'ubuntu')
+          if [[ ${{ matrix.os }} == windows-latest ]]; then
+            path="out/make/squirrel.windows/x64/${packageName}-${packageVersion} Setup.exe"
+          elif [[ ${{ matrix.os }} == macOS-13 ]]; then
+            path="out/make/${packageName}-${packageVersion}-x64.dmg"
+          elif [[ ${{ matrix.os }} == macOS-latest ]]; then
+            path="out/make/${packageName}-${packageVersion}-arm64.dmg"
+          elif [[ ${{ matrix.os }} == ubuntu-latest ]]; then
+            path="out/make/deb/x64/${packageName}_${packageVersion}_amd64.deb"
+          fi
+          echo path=$path >> $GITHUB_OUTPUT
+
+      - name: ⬆ Upload installer
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ format('linux-installer-{0}', github.event.inputs.setting) }}
-          path: out/make/deb/x64/${{ steps.package_info.outputs.name }}_${{ steps.package_info.outputs.version }}_amd64.deb
+          name: ${{steps.installer_info.outputs.name}}
+          path: ${{steps.installer_info.outputs.path}}
           if-no-files-found: error

.github/workflows/workflow-test.yml

@@ -0,0 +1,58 @@
+name: 🧪 Test Dispatch
+
+# Workflow dispatch for packaging an electron executable
+on:
+  workflow_dispatch:
+    inputs:
+      setting:
+        type: choice
+        options:
+          - "home"
+          - "clinic"
+        default: "home"
+        required: true
+        description: Package the app for 'home' or 'clinic' use
+      os:
+        type: choice
+        description: Which operating system to make executables for
+        required: true
+        default: "All"
+        options:
+          - "All"
+          - "Windows"
+          - "macOS"
+          - "Linux"
+
+jobs:
+  test-dispatch:
+    name: Test Dispatch
+    runs-on: ${{ matrix.os }}
+
+    # Run action for [home/clinic] in [windows/macOS/ubuntu] based on user input
+    strategy:
+      matrix:
+        # TODO: There's got to be a better way to handle this?
+        # os: ${{
+        #   (github.event.inputs.os == 'All' && fromJSON('["ubuntu-latest", "macOS-13", "windows-latest"]')) ||
+        #   (github.event.inputs.os == 'Windows' && fromJSON('["windows-latest"]')) ||
+        #   (github.event.inputs.os == 'macOS' && fromJSON('["macOS-13"]')) ||
+        #   (github.event.inputs.os == 'Linux' && fromJSON('["ubuntu-latest"]')) }}
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+        exclude:
+          - os: ubuntu-latest
+            if: ${{ github.event.inputs.os != 'All' && github.event.inputs.os != 'Linux' }}
+          - os: macOS-latest
+            if: ${{ github.event.inputs.os != 'All' && github.event.inputs.os != 'macOS' }}
+          - os: windows-latest
+            if: ${{ github.event.inputs.os != 'All' && github.event.inputs.os != 'Windows' }}
+      fail-fast: false # A failed build will not end the other matrix jobs
+
+    steps:
+      # Set up runner
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+
+      - run: echo ${{ runner.os }}

forge.config.js

@@ -5,6 +5,7 @@ export default {
   packagerConfig: {
     asar: true,
     icon: "assets/icons/icon",
+    osxSign: {},
   },
   makers: [
     {
@@ -32,10 +33,6 @@ export default {
         },
       },
     },
-    {
-      // zip files
-      name: "@electron-forge/maker-zip",
-    },
   ],
   plugins: [
     { name: "@electron-forge/plugin-auto-unpack-natives", config: {} },
@@ -62,12 +59,11 @@ export default {
         version: FuseVersion.V1,
         [FuseV1Options.RunAsNode]: false, // Disables ELECTRON_RUN_AS_NODE
         [FuseV1Options.GrantFileProtocolExtraPrivileges]: true, // Grants the file protocol extra privileges (for the built application)
-        [FuseV1Options.EnableCookieEncryption]: false, // Disables cookie encryption
+        [FuseV1Options.EnableCookieEncryption]: true, // Enables cookie encryption
         [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false, // Disables the NODE_OPTIONS environment variable
         [FuseV1Options.EnableNodeCliInspectArguments]: false, // Disables the --inspect and --inspect-brk family of CLI options
         [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true, // Enforces validation of the app.asar archive on macOS
         [FuseV1Options.OnlyLoadAppFromAsar]: true, // Enforces that Electron will only load your app from "app.asar" instead of its normal search paths
-        [FuseV1Options.LoadBrowserProcessSpecificV8Snapshot]: true, // Loads V8 Snapshot from `browser_v8_context_snapshot.bin` for the browser process
       },
     },
   ],

package.json

@@ -50,7 +50,6 @@
     "@electron-forge/maker-deb": "^7.4.0",
     "@electron-forge/maker-dmg": "^7.4.0",
     "@electron-forge/maker-squirrel": "^7.4.0",
-    "@electron-forge/maker-zip": "^7.4.0",
     "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
     "@electron-forge/plugin-vite": "^7.4.0",
     "@inquirer/prompts": "^5.3.6",
@@ -89,8 +88,9 @@
     "build:turk-prolific": "dotenv -e env/.env.turk-prolific npm run build",
     "make": "electron-forge make",
     "make:windows": "electron-forge make --arch x64 --targets @electron-forge/maker-squirrel",
+    "make:mac-x64": "electron-forge make --arch x64 --targets @electron-forge/maker-dmg",
+    "make:mac-arm64": "electron-forge make --arch arm64 --targets @electron-forge/maker-dmg",
     "make:linux": "electron-forge make --arch x64 --targets @electron-forge/maker-deb",
-    "make:mac": "electron-forge make  --arch universal --targets @electron-forge/maker-dmg",
     "cli": "node cli.mjs",
     "commit": "git-cz",
     "format": "prettier --write .",

src/Electron/main.js

@@ -310,6 +310,7 @@ function createWindow() {
     mainWindow.loadURL(MAIN_WINDOW_VITE_DEV_SERVER_URL);
   } else {
     // TODO @brown-ccv: JsPsych protections for loading from a file://
+    log.info("LOADING RENDERER IN PRODUCTION");
     mainWindow.loadFile(path.join(__dirname, `../renderer/${MAIN_WINDOW_VITE_NAME}/index.html`));
   }
   log.info("Loaded Renderer process");