diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-03-14 11:01:28 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-03-14 11:01:28 +0100 |
| commit | 45aec8a4d48180333cc082fbd63341ae58868d40 (patch) | |
| tree | 6dfd95bf76dcec60948d15762097d499e8fe0df0 /ci | |
| parent | c8f540951f318253a36e9f3ad20b607cefeb9be0 (diff) | |
| parent | dd052143038874875942918025265f7546983f94 (diff) | |
| download | mullvadvpn-45aec8a4d48180333cc082fbd63341ae58868d40.tar.xz mullvadvpn-45aec8a4d48180333cc082fbd63341ae58868d40.zip | |
Merge branch 'add-mold-to-container'
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/buildserver-build-android.sh | 4 | ||||
| -rwxr-xr-x | ci/buildserver-build.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ci/buildserver-build-android.sh b/ci/buildserver-build-android.sh index 81098eb9e8..61bf556d83 100755 --- a/ci/buildserver-build-android.sh +++ b/ci/buildserver-build-android.sh @@ -60,7 +60,9 @@ function build_ref { git clean -df echo "Building Android app" - ANDROID_CREDENTIALS_DIR=$ANDROID_CREDENTIALS_DIR ./building/containerized-build.sh android --app-bundle || return 0 + ANDROID_CREDENTIALS_DIR=$ANDROID_CREDENTIALS_DIR \ + USE_MOLD=false \ + ./building/containerized-build.sh android --app-bundle || return 0 # If there is a tag for this commit then we append that to the produced artifacts # A version suffix should only be created if there is a tag for this commit and it is not a release build diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index aa85313cfe..1a74b8b8ca 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -68,7 +68,7 @@ function upload { # means in a container on Linux, and straight up in the local shell elsewhere. function run_in_build_env { if [[ "$(uname -s)" == "Linux" ]]; then - ./building/container-run.sh linux "$@" + USE_MOLD=false ./building/container-run.sh linux "$@" else bash -c "$*" fi |