summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2025-01-27 10:42:56 +0100
committerDavid Lönnhager <david.l@mullvad.net>2025-01-27 10:42:56 +0100
commitdd5469dcb24dc546274528357b8ac2ec52a545a9 (patch)
tree46b08548d15e0fed3e14bf5c7042b92bc7e57478
parentde7eab1a0bff32b14acc9dffe6b7c3583d5d5409 (diff)
parent822e6efa3ec3c0810a0a2d87275151b07e20641e (diff)
downloadmullvadvpn-dd5469dcb24dc546274528357b8ac2ec52a545a9.tar.xz
mullvadvpn-dd5469dcb24dc546274528357b8ac2ec52a545a9.zip
Merge branch 'fix-zig-action-arm'
-rw-r--r--.github/workflows/daemon.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml
index 7977d8ab68..f37b6c6d54 100644
--- a/.github/workflows/daemon.yml
+++ b/.github/workflows/daemon.yml
@@ -186,8 +186,15 @@ jobs:
vs-version: 16
- name: Install latest zig
+ # NOTE: This action doesn't support ARM64 for the time being (2025-01-27)
+ if: ${{ matrix.config.arch == 'x64' }}
uses: mlugg/setup-zig@v1
+ - name: Install Go
+ uses: actions/setup-go@v5
+ with:
+ go-version: 1.21.3
+
- name: Build Windows modules
if: steps.cache-windows-modules.outputs.cache-hit != 'true'
shell: bash