Merge build steps for multiple platforms (#931)

In order to have a single electron build step, utilize the workflow input.
NordicSemiconductor · Dec 18, 2023 · e3a9231 · e3a9231
1 parent ff62fdd
commit e3a9231
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,9 @@ on:
       runner:
         required: true
         type: string # [Windows, macOS, Linux]
+      electronArgument:
+        required: true
+        type: string # e.g. --windows nsis:x64
 
 jobs:
   build:
@@ -27,15 +30,8 @@ jobs:
       - name: Build for Production
         run: npm run build:prod
 
-      - name: Run Electron Builder (Windows)
-        if: runner.os == 'Windows'
-        run: npx electron-builder -p never --windows nsis:x64
-      - name: Run Electron Builder (macOS)
-        if: runner.os == 'macOS'
-        run: npx electron-builder -p never --x64
-      - name: Run Electron Builder (Linux)
-        if: runner.os == 'Linux'
-        run: npx electron-builder -p never
+      - name: Run Electron Builder
+        run: npx electron-builder -p never ${{ inputs.electronArgument }}
 
       - name: Publish built artifact
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,16 +13,20 @@ jobs:
     uses: ./.github/workflows/build.yml
     with:
       runner: windows-latest
+      electronArgument: --windows nsis:x64
   build_on_ubuntu:
     uses: ./.github/workflows/build.yml
     with:
       runner: ubuntu-latest
+      electronArgument: ''
 
     # build_on_mac_intel:
     #   uses: ./.github/workflows/build.yml
     #   with:
     #       runner: macos-latest
+    #       electronArgument: --x64
     # build_on_mac_apple_silicon:
     #   uses: ./.github/workflows/build.yml
     #   with:
     #     runner: macos-latest-xlarge
+          # electronArgument: