Skip to content

Commit a315511

Browse files
committed
Use contains in pipeline for better cross-arch support of tag variants
Signed-off-by: Marcus Crane <[email protected]>
1 parent 2e1feb7 commit a315511

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/release.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ jobs:
2828
platform: linux/amd64
2929
os: ubuntu-latest
3030
tag: linux_amd64
31+
- arch: arm64
32+
platform: linux/arm64
33+
os: buildjet-4vcpu-ubuntu-2204-arm
34+
tag: linux_arm64_webkit2gtk40
3135
- arch: arm64
3236
platform: linux/arm64
3337
os: buildjet-4vcpu-ubuntu-2204-arm
@@ -79,13 +83,13 @@ jobs:
7983

8084
## Linux (webkit2gtk-4.0)
8185
- name: Install Ubuntu prerequisites
82-
if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64_webkit2gtk40'
86+
if: runner.os == 'Linux' && contains(matrix.build.tag, 'webkit2gtk40')
8387
shell: bash
8488
run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev
8589

8690
## Linux (webkit2gtk-4.1)
8791
- name: Install Ubuntu prerequisites
88-
if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64'
92+
if: runner.os == 'Linux' && !contains(matrix.build.tag, 'webkit2gtk40')
8993
shell: bash
9094
run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev
9195

@@ -122,13 +126,13 @@ jobs:
122126

123127
## Linux (webkit2gtk-4.0) -- We explicitly set 4.0 in this tag because it'll only be less used over time
124128
- name: Build wails app for Linux (webkit2gtk-4.0)
125-
if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64_webkit2gtk40'
129+
if: runner.os == 'Linux' && contains(matrix.build.tag, 'webkit2gtk40')
126130
shell: bash
127131
run: wails build -platform ${{ matrix.build.platform }} -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"
128132

129133
## Linux (webkit2gtk-4.1) -- We set this as the new default as more users will use 24.0x+ over time
130134
- name: Build wails app for Linux (webkit2gtk-4.1)
131-
if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64'
135+
if: runner.os == 'Linux' && !contains(matrix.build.tag, 'webkit2gtk40')
132136
shell: bash
133137
run: wails build -platform ${{ matrix.build.platform }} -tags webkit2_41 -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"
134138

0 commit comments

Comments
 (0)