From c792fe9d9136f9dc89042fe87b93ebbd531acf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B6nnhager?= <david.l@mullvad.net>
Date: Mon, 20 Nov 2023 14:40:10 +0100
Subject: [PATCH] test: build macos artifacts on self-hosted runner

---
 .github/workflows/desktop-e2e.yml | 40 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/desktop-e2e.yml b/.github/workflows/desktop-e2e.yml
index dc6f84a2eb81..96b5863452fa 100644
--- a/.github/workflows/desktop-e2e.yml
+++ b/.github/workflows/desktop-e2e.yml
@@ -152,36 +152,40 @@ jobs:
 
   build-macos:
     if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
-    runs-on: macos-latest
+    runs-on: [self-hosted, desktop-test, macOS] # app-test-macos-arm
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
       - name: Checkout submodules
         run: git submodule update --init --depth=1
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.18.5
       - name: Install Protoc
-        uses: arduino/setup-protoc@v1
+        uses: arduino/setup-protoc@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/setup-node@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          node-version: 18
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1.0.6
+
+      - name: Read volta info
+        id: volta
+        uses: zoexx/github-action-json-file-properties@release
         with:
-          toolchain: stable
-          target: aarch64-apple-darwin
-          default: true
-      - name: Install Go
-        uses: actions/setup-go@v3
+          file_path: 'gui/package.json'
+          prop_path: 'volta'
+      - name: Setup node
+        uses: actions/setup-node@v3
         with:
-          go-version: 1.18.5
+          token: ${{ secrets.GITHUB_TOKEN }}
+          node-version: ${{ steps.volta.outputs.node }}
+          cache: 'npm'
+          cache-dependency-path: gui/package-lock.json
+      - name: Update NPM
+        run: npm i -g npm@${{ steps.volta.outputs.npm }}
       - name: Build app
-        run: ./build.sh --universal
+        run: ./build.sh
       - name: Build test executable
-        run: ./gui/scripts/build-test-executable.sh aarch64-apple-darwin
-        # FIXME: This fails for some reason, but the artifact is built
-        continue-on-error: true
+        run: ./gui/scripts/build-test-executable.sh
       - uses: actions/upload-artifact@v3
         if: '!cancelled()'
         with: