diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-08-28 14:02:54 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-08-28 14:02:54 +0200 |
| commit | 8250730d9ee6308eb7e88134fc9497a5f22cebed (patch) | |
| tree | 36439a7fae2cbe512ce0b5a2991fb3daedb9260a /.github | |
| parent | 6d09010a73efd48457091629537d47c92bef64c8 (diff) | |
| parent | 81361181795d27a1060ccf019ec5126dfba4c0f4 (diff) | |
| download | mullvadvpn-8250730d9ee6308eb7e88134fc9497a5f22cebed.tar.xz mullvadvpn-8250730d9ee6308eb7e88134fc9497a5f22cebed.zip | |
Merge branch 'build-windows-windows-11-arm-arm64-in-github-ci-fails-des-2405'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/daemon.yml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index b31502ad63..c2e7df53eb 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -192,11 +192,21 @@ jobs: with: go-version: 1.21.3 - - name: Build Windows modules - if: steps.cache-windows-modules.outputs.cache-hit != 'true' + - name: Build Windows modules (x86_64) + if: ${{ (steps.cache-windows-modules.outputs.cache-hit != 'true') && (matrix.config.arch == 'x64') }} shell: bash run: ./build-windows-modules.sh + - name: Build Windows modules (ARM64) + if: ${{ (steps.cache-windows-modules.outputs.cache-hit != 'true') && (matrix.config.arch == 'arm64') }} + shell: bash + # By default, ./build-windows-modules.sh will use 4 concurrent processes during compilation + # because the Windows 11 ARM runner has 4 cores: + # https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories + # + # Cap the number of concurrent processes to something less than 4 to avoid OOM issues. + run: ./build-windows-modules.sh --max-concurrent-processes 3 + - name: Build and test crates shell: bash env: |