tt

balena-io · Dec 20, 2023 · bec1c16 · bec1c16
1 parent de7f863
commit bec1c16
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 38 deletions.
diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
@@ -24,24 +24,6 @@ runs:
   # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
   using: "composite"
   steps:
-    - name: Download custom source artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
-        path: ${{ runner.temp }}
-
-    - name: Extract custom source artifact
-      if: runner.os != 'Windows'
-      shell: bash
-      working-directory: .
-      run: tar -xf ${{ runner.temp }}/custom.tgz
-
-    - name: Extract custom source artifact
-      if: runner.os == 'Windows'
-      shell: pwsh
-      working-directory: .
-      run: C:\"Program Files"\Git\usr\bin\tar.exe --force-local -xf ${{ runner.temp }}\custom.tgz
-
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
@@ -130,20 +112,24 @@ runs:
 
         elif [[ "${RUNNER_OS}" == macOS ]]; then
           PLATFORM=Darwin
-          BUILD_ARCHS="x64,arm64"
+          BUILD_ARCHS="x64 arm64"
           SHA256SUM_BIN='shasum -a 256'
 
         elif [[ "${RUNNER_OS}" == Windows ]]; then
           PLATFORM=Windows
-          #BUILD_ARCHS="ia32,x64" -- distutils fails to build for ia32
+          #BUILD_ARCHS="ia32 x64" -- distutils fails to build for ia32
           BUILD_ARCHS="x64"
 
         else
           echo "ERROR: unexpected runner OS: ${RUNNER_OS}"
           exit 1
         fi
 
-        npx electron-forge make --arch="${BUILD_ARCHS}"
+        npm ci
+
+        for arch in ${BUILD_ARCHS}; do
+          npx electron-forge make --arch="${arch}"
+        done
 
         echo "version=${APPLICATION_VERSION}" >> $GITHUB_OUTPUT
 

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -63,20 +63,3 @@ runs:
       env:
         # https://www.electronjs.org/docs/latest/api/environment-variables
         ELECTRON_NO_ATTACH_CONSOLE: 'true'
-
-    - name: Compress custom source
-      if: runner.os != 'Windows'
-      shell: bash
-      run: tar -acf ${{ runner.temp }}/custom.tgz .
-
-    - name: Compress custom source
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: C:\"Program Files"\Git\usr\bin\tar.exe --force-local -acf ${{ runner.temp }}\custom.tgz .
-
-    - name: Upload custom artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
-        path: ${{ runner.temp }}/custom.tgz
-        retention-days: 1