summaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2025-07-17 10:43:54 +0200
committerAlbin <albin@mullvad.net>2025-07-17 10:43:54 +0200
commita7e5d9ff3f840acfd78dee23924c174de741227b (patch)
treed76e97352db94ebe5496beb97724ab07f9046421 /.github
parentc9cf9cb22d112efece39cc4e06c1f068600315a3 (diff)
parent4d7a8a72a32b78027ae6a5f6d963d75b79d81850 (diff)
downloadmullvadvpn-a7e5d9ff3f840acfd78dee23924c174de741227b.tar.xz
mullvadvpn-a7e5d9ff3f840acfd78dee23924c174de741227b.zip
Merge branch 'add-macos-devshell-support'
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/android-reproducible-builds.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/android-reproducible-builds.yml b/.github/workflows/android-reproducible-builds.yml
index 9b9eb9504c..db468fdec5 100644
--- a/.github/workflows/android-reproducible-builds.yml
+++ b/.github/workflows/android-reproducible-builds.yml
@@ -138,8 +138,14 @@ jobs:
build-using-nix:
name: Build fdroid variant using nix
- runs-on: ubuntu-24.04
+ runs-on: ${{ matrix.runs-on }}
needs: set-up-env
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - runs-on: ubuntu-latest
+ - runs-on: macos-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -162,7 +168,7 @@ jobs:
- name: Upload apks
uses: actions/upload-artifact@v4
with:
- name: apk-nix
+ name: apk-nix-${{ matrix.runs-on }}
path: android/app/build/outputs/apk/ossProd/fdroid/app-oss-prod-fdroid-unsigned.apk
if-no-files-found: error
retention-days: 7