diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-05-12 13:41:19 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-05-12 13:41:19 +0200 |
| commit | 405b0be1f551906890be84f5e8aca3539b6bcfbf (patch) | |
| tree | 5c7844db490c349c712403516bd6a3001a6baa38 | |
| parent | 3c0d512c691dc2506ff90c5b68c0af3c4ca6a712 (diff) | |
| parent | dff7ef7f86fffe20c3d2671965c41e90330a5c2d (diff) | |
| download | mullvadvpn-405b0be1f551906890be84f5e8aca3539b6bcfbf.tar.xz mullvadvpn-405b0be1f551906890be84f5e8aca3539b6bcfbf.zip | |
Merge branch 'fix-reproducible-build-workflow-gradle-version-droid-1995'
| -rw-r--r-- | .github/workflows/android-reproducible-builds.yml | 6 | ||||
| -rw-r--r-- | android/gradle/wrapper/UpdateInstructions.md | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/android-reproducible-builds.yml b/.github/workflows/android-reproducible-builds.yml index f1f7568cc7..1049b78b0f 100644 --- a/.github/workflows/android-reproducible-builds.yml +++ b/.github/workflows/android-reproducible-builds.yml @@ -82,8 +82,8 @@ jobs: run: | sudo apt-get -y remove gradle mkdir /opt/gradle - curl -sfLo /opt/gradle/gradle-8.13-bin.zip https\://services.gradle.org/distributions/gradle-8.13-bin.zip - unzip -d /opt/gradle /opt/gradle/gradle-8.13-bin.zip + curl -sfLo /opt/gradle/gradle-8.14-bin.zip https\://services.gradle.org/distributions/gradle-8.14-bin.zip + unzip -d /opt/gradle /opt/gradle/gradle-8.14-bin.zip # These are equivalent to the sudo section of the metadata file - name: Install dependencies @@ -105,7 +105,7 @@ jobs: - name: Build app run: | - export PATH=$PATH:/opt/gradle/gradle-8.13/bin + export PATH=$PATH:/opt/gradle/gradle-8.14/bin fdroid build net.mullvad.mullvadvpn:1 - name: Upload apks diff --git a/android/gradle/wrapper/UpdateInstructions.md b/android/gradle/wrapper/UpdateInstructions.md index bafbd49f86..a66a43d06a 100644 --- a/android/gradle/wrapper/UpdateInstructions.md +++ b/android/gradle/wrapper/UpdateInstructions.md @@ -9,3 +9,7 @@ ``` ./gradlew wrapper --gradle-version=VERSION --gradle-distribution-sha256-sum SHA256 && ./gradlew wrapper ``` + +4. Update the gradle version to the new version in `.github/workflows/android-reproducible-builds.xml`. The steps required to update are: + - build-fdroid-app-server/Install gradle + - build-fdroid-app-server/Build app |