From bec1c167b814fdf39e3d0011d5f49590a9c8c2c3 Mon Sep 17 00:00:00 2001 From: Akis Kesoglou Date: Wed, 20 Dec 2023 15:08:56 +0200 Subject: [PATCH] tt --- .github/actions/publish/action.yml | 28 +++++++--------------------- .github/actions/test/action.yml | 17 ----------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 392dd315f3c..10fe3e03946 100644 --- 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,12 +112,12 @@ 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 @@ -143,7 +125,11 @@ runs: 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 index 75e9be9b5ff..26b08939471 100644 --- 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