From b17e1880f830d96949683b26fc07140f93c095d5 Mon Sep 17 00:00:00 2001 From: Vichy Date: Mon, 11 Sep 2023 20:05:53 +0700 Subject: [PATCH 1/5] Add support for x86 Windows machines --- .github/workflows/deploy.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4e971cf3..bfa90097 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,10 +10,16 @@ jobs: fail-fast: true matrix: platform: [ubuntu-latest, windows-latest] # macos-latest + arch: [i686-pc-windows-msvc, ] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 + - name: check for invalid target + if: matrix.platform == 'ubuntu-latest' && matrix.arch != '' + run: echo "::error arch=$arch::Invalid target for Ubuntu" + env: + arch: ${{ matrix.arch }} - name: setup node uses: actions/setup-node@v1 with: @@ -31,6 +37,12 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libasound2-dev + - name: install and preset x86 deps + if: matrix.platform == 'windows-latest' && matrix.arch != '' + run: | + rustup target add i686-pc-windows-msvc + echo "TAURI_ARGS=--target i686-pc-windows-msvc" >> $GITHUB_ENV + - name: install - name: import windows certificate if: matrix.platform == 'windows-latest' env: @@ -50,6 +62,7 @@ jobs: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} with: + args: ${{ env.TAURI_ARGS }} tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version releaseName: 'v__VERSION__' releaseBody: 'Please see https://github.com/WootingKb/wooting-macros/releases/tag/v__VERSION__ for full changelog' From eff5e9638c8020bc7fc34a6cc80022697894b403 Mon Sep 17 00:00:00 2001 From: Vichy Date: Mon, 11 Sep 2023 20:08:23 +0700 Subject: [PATCH 2/5] Deleted errorneous line --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bfa90097..510b0ee5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,7 +42,6 @@ jobs: run: | rustup target add i686-pc-windows-msvc echo "TAURI_ARGS=--target i686-pc-windows-msvc" >> $GITHUB_ENV - - name: install - name: import windows certificate if: matrix.platform == 'windows-latest' env: From f5e607fd7a4987ccd9dcceae1d79246e96d7103c Mon Sep 17 00:00:00 2001 From: Vichy Date: Mon, 11 Sep 2023 20:22:02 +0700 Subject: [PATCH 3/5] Fixed build matrix --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 510b0ee5..686011e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,13 +10,13 @@ jobs: fail-fast: true matrix: platform: [ubuntu-latest, windows-latest] # macos-latest - arch: [i686-pc-windows-msvc, ] + arch: [i686-pc-windows-msvc, triple] # ignored by cargo runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 - name: check for invalid target - if: matrix.platform == 'ubuntu-latest' && matrix.arch != '' + if: matrix.platform == 'ubuntu-latest' && matrix.arch == 'i686-pc-windows-msvc' run: echo "::error arch=$arch::Invalid target for Ubuntu" env: arch: ${{ matrix.arch }} @@ -38,7 +38,7 @@ jobs: sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libasound2-dev - name: install and preset x86 deps - if: matrix.platform == 'windows-latest' && matrix.arch != '' + if: matrix.platform == 'windows-latest' && matrix.arch == 'i686-pc-windows-msvc' run: | rustup target add i686-pc-windows-msvc echo "TAURI_ARGS=--target i686-pc-windows-msvc" >> $GITHUB_ENV From 3e5e231045b6c9b6d0d6c8ac740c53cf125afd14 Mon Sep 17 00:00:00 2001 From: Vichy Date: Mon, 11 Sep 2023 20:28:32 +0700 Subject: [PATCH 4/5] Fixed non-exiting job --- .github/workflows/deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 686011e8..a98b631d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,14 +10,16 @@ jobs: fail-fast: true matrix: platform: [ubuntu-latest, windows-latest] # macos-latest - arch: [i686-pc-windows-msvc, triple] # ignored by cargo + arch: [i686-pc-windows-msvc, other] # ignored by cargo runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 - name: check for invalid target if: matrix.platform == 'ubuntu-latest' && matrix.arch == 'i686-pc-windows-msvc' - run: echo "::error arch=$arch::Invalid target for Ubuntu" + run: | + echo "::error arch=$arch::Invalid target for Ubuntu" + exit 1 env: arch: ${{ matrix.arch }} - name: setup node From d6efaf110cec89e0bc8b3da499b1b74d599b69a8 Mon Sep 17 00:00:00 2001 From: Vichy Date: Mon, 11 Sep 2023 20:37:00 +0700 Subject: [PATCH 5/5] Fixed fail-fast --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a98b631d..190706f5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ on: jobs: publish-tauri: strategy: - fail-fast: true + fail-fast: false matrix: platform: [ubuntu-latest, windows-latest] # macos-latest arch: [i686-pc-windows-msvc, other] # ignored by cargo