diff options
| author | Albin <albin@mullvad.net> | 2026-04-16 14:28:51 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2026-04-17 14:29:15 +0200 |
| commit | adc1dbde9a10ccc32b5988f4f237ac00aefcb741 (patch) | |
| tree | 41f0edfbc1c95d0814b0d8dbdfa5d2a92174860c | |
| parent | 0f615a3a6712b030f1b73f617ecaec18a054eaff (diff) | |
| download | mullvadvpn-adc1dbde9a10ccc32b5988f4f237ac00aefcb741.tar.xz mullvadvpn-adc1dbde9a10ccc32b5988f4f237ac00aefcb741.zip | |
Move workflow memory limit to GRADLE_OPTS
| -rw-r--r-- | .github/workflows/android-reproducible-builds.yml | 7 | ||||
| -rw-r--r-- | android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/android-reproducible-builds.yml b/.github/workflows/android-reproducible-builds.yml index 90c1c7c7d5..2ad4750aa1 100644 --- a/.github/workflows/android-reproducible-builds.yml +++ b/.github/workflows/android-reproducible-builds.yml @@ -63,12 +63,9 @@ jobs: run: | git fetch --no-tags origin 'refs/tags/android/*:refs/tags/android/*' - - name: Lower available memory for gradle - run: | - sed -i 's|^org\.gradle\.jvmargs=.*|org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\\="-Xmx4096M"|' \ - android/gradle.properties - - name: Build app + env: + GRADLE_OPTS: '-Dorg.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options="-Xmx4096M"' run: ./building/containerized-build.sh android --oss-only - name: Upload apks diff --git a/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml b/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml index c6dacdab85..4b6b59bd12 100644 --- a/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml +++ b/android/fdroid-build/metadata/net.mullvad.mullvadvpn.yml @@ -44,13 +44,13 @@ Builds: - sed -i -e '/billing/d' ../settings.gradle.kts - sed -i -e '/projects.lib.billing/d' build.gradle.kts - sed -i '/\"desktop\//d' ../../Cargo.toml - # This is to increase stability of verification builds, not required for official fdroid builds - - sed -i 's/8192M/4096M/g' ../gradle.properties scanignore: - android/rust-android-gradle-plugin/plugin/build.gradle.kts build: - NDK_PATH="$$NDK$$" source ../fdroid-build/env.sh - echo $NDK_TOOLCHAIN_DIR "$$NDK$$" + # This is to increase stability of verification builds, not required for official fdroid builds + - export GRADLE_OPTS='-Dorg.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options="-Xmx4096M"' - ../build.sh --oss-only --skip-clean-check ndk: 27.3.13750724 |