Use contains in pipeline for better cross-arch support of tag variants

Signed-off-by: Marcus Crane <[email protected]>
marcus-crane · Dec 7, 2024 · a315511 · a315511
1 parent 2e1feb7
commit a315511
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,6 +28,10 @@ jobs:
             platform: linux/amd64
             os: ubuntu-latest
             tag: linux_amd64
+          - arch: arm64
+            platform: linux/arm64
+            os: buildjet-4vcpu-ubuntu-2204-arm
+            tag: linux_arm64_webkit2gtk40
           - arch: arm64
             platform: linux/arm64
             os: buildjet-4vcpu-ubuntu-2204-arm
@@ -79,13 +83,13 @@ jobs:
 
       ## Linux (webkit2gtk-4.0)
       - name: Install Ubuntu prerequisites
-        if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64_webkit2gtk40'
+        if: runner.os == 'Linux' && contains(matrix.build.tag, 'webkit2gtk40')
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev
 
       ## Linux (webkit2gtk-4.1)
       - name: Install Ubuntu prerequisites
-        if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64'
+        if: runner.os == 'Linux' && !contains(matrix.build.tag, 'webkit2gtk40')
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev
 
@@ -122,13 +126,13 @@ jobs:
 
       ## Linux (webkit2gtk-4.0) -- We explicitly set 4.0 in this tag because it'll only be less used over time
       - name: Build wails app for Linux (webkit2gtk-4.0)
-        if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64_webkit2gtk40'
+        if: runner.os == 'Linux' && contains(matrix.build.tag, 'webkit2gtk40')
         shell: bash
         run: wails build -platform ${{ matrix.build.platform }} -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"
 
       ## Linux (webkit2gtk-4.1) -- We set this as the new default as more users will use 24.0x+ over time
       - name: Build wails app for Linux (webkit2gtk-4.1)
-        if: runner.os == 'Linux' && matrix.build.tag == 'linux_amd64'
+        if: runner.os == 'Linux' && !contains(matrix.build.tag, 'webkit2gtk40')
         shell: bash
         run: wails build -platform ${{ matrix.build.platform }} -tags webkit2_41 -ldflags "-X main.version=v${{ steps.normalise_version.outputs.version }}"