diff options
| author | Albin <albin@mullvad.net> | 2025-07-15 15:38:33 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-07-15 15:38:33 +0200 |
| commit | 592636ad50e93c1990d7b08321378ea19a4c33e4 (patch) | |
| tree | 4314baf1bff9867ab1eb605f8e24f8bc70a25d38 /.github | |
| parent | a3ec4507f0e0dcd35e1940e897eb1d3a51151940 (diff) | |
| parent | 3771dff76a96665db0f93c0ec8af5e944ec429ec (diff) | |
| download | mullvadvpn-592636ad50e93c1990d7b08321378ea19a4c33e4.tar.xz mullvadvpn-592636ad50e93c1990d7b08321378ea19a4c33e4.zip | |
Merge branch 'add-initial-android-devshell'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android-reproducible-builds.yml | 33 | ||||
| -rw-r--r-- | .github/workflows/verify-locked-down-signatures.yml | 1 |
2 files changed, 33 insertions, 1 deletions
diff --git a/.github/workflows/android-reproducible-builds.yml b/.github/workflows/android-reproducible-builds.yml index 0650dfd687..9b9eb9504c 100644 --- a/.github/workflows/android-reproducible-builds.yml +++ b/.github/workflows/android-reproducible-builds.yml @@ -136,10 +136,41 @@ jobs: if-no-files-found: error retention-days: 7 + build-using-nix: + name: Build fdroid variant using nix + runs-on: ubuntu-24.04 + needs: set-up-env + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ needs.set-up-env.outputs.COMMIT_HASH }} + + - name: Fetch submodules and tags + run: | + git submodule update --init wireguard-go-rs/libwg/wireguard-go + git fetch --no-tags origin 'refs/tags/android/*:refs/tags/android/*' + + - uses: cachix/install-nix-action@v31 + with: + nix_path: nixpkgs=channel:nixos-unstable + + - name: Build app + working-directory: android + run: nix develop -c ./gradlew assembleOssProdFdroid + + - name: Upload apks + uses: actions/upload-artifact@v4 + with: + name: apk-nix + path: android/app/build/outputs/apk/ossProd/fdroid/app-oss-prod-fdroid-unsigned.apk + if-no-files-found: error + retention-days: 7 + compare-builds: name: Check builds runs-on: ubuntu-latest - needs: [build-using-container, build-using-fdroidserver] + needs: [build-using-container, build-using-fdroidserver, build-using-nix] steps: - name: Download artifacts uses: actions/download-artifact@v4 diff --git a/.github/workflows/verify-locked-down-signatures.yml b/.github/workflows/verify-locked-down-signatures.yml index 61c4c271c9..70b0a4bdb4 100644 --- a/.github/workflows/verify-locked-down-signatures.yml +++ b/.github/workflows/verify-locked-down-signatures.yml @@ -27,6 +27,7 @@ on: - android/gradle/wrapper/gradle-wrapper.jar - android/gradle/wrapper/gradle-wrapper.properties - android/scripts/lockfile + - android/flake.lock - building/build-and-publish-container-image.sh - building/mullvad-app-container-signing.asc - building/linux-container-image.txt |