diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-05-20 08:55:07 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-05-20 08:55:07 +0200 |
| commit | d2e13c40a83889c470d6fbbcfc5b041696a21605 (patch) | |
| tree | 8bb2a593217edafb255a8ed95d00d34152e86e4c | |
| parent | 1d723bea9392a147c3f653ddd93eb04ccb2ffec3 (diff) | |
| parent | 585ae3da3acfa68b906c8375a2c25c1d0736443a (diff) | |
| download | mullvadvpn-d2e13c40a83889c470d6fbbcfc5b041696a21605.tar.xz mullvadvpn-d2e13c40a83889c470d6fbbcfc5b041696a21605.zip | |
Merge branch 'check-whether-github-woa-runner-are-usable-yet-tb-1-day-des-2157'
| -rw-r--r-- | .github/workflows/daemon.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index d90f766356..de5e808f08 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -121,7 +121,7 @@ jobs: config: - os: windows-latest arch: x64 - - os: [self-hosted, ARM64, Windows] + - os: windows-11-arm arch: arm64 runs-on: ${{ matrix.config.os }} steps: @@ -139,8 +139,6 @@ jobs: git submodule update --init wireguard-go-rs/libwg/wireguard-go - name: Install Protoc - # NOTE: ARM runner already has protoc - if: ${{ matrix.config.arch != 'arm64' }} uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -171,11 +169,15 @@ jobs: # The x64 toolchain is needed to build talpid-openvpn-plugin # TODO: Remove once fixed - name: Install Rust x64 target + uses: actions-rust-lang/setup-rust-toolchain@v1 if: ${{ matrix.config.arch == 'arm64' }} - run: rustup target add x86_64-pc-windows-msvc + with: + target: x86_64-pc-windows-msvc - name: Install Rust - run: rustup target add i686-pc-windows-msvc + uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + target: i686-pc-windows-msvc - name: Install msbuild uses: microsoft/setup-msbuild@v1.0.2 @@ -183,8 +185,6 @@ 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 |