diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2025-08-07 15:56:23 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2025-08-08 09:29:15 +0200 |
| commit | 8e949bf83659c1bc598054f2b34ae98cc13334bb (patch) | |
| tree | f8da04c4d685e0231f9f5770871e93f653697203 | |
| parent | a7c4bbbd292c8049f84a98736c51b62444f14914 (diff) | |
| download | mullvadvpn-8e949bf83659c1bc598054f2b34ae98cc13334bb.tar.xz mullvadvpn-8e949bf83659c1bc598054f2b34ae98cc13334bb.zip | |
Remove all usage of USE_MOLD env var for containers
| -rwxr-xr-x | building/container-run.sh | 11 | ||||
| -rwxr-xr-x | ci/buildserver-build-android.sh | 3 | ||||
| -rwxr-xr-x | ci/buildserver-build.sh | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/building/container-run.sh b/building/container-run.sh index 2defc76170..94ccc97d10 100755 --- a/building/container-run.sh +++ b/building/container-run.sh @@ -16,10 +16,6 @@ CARGO_REGISTRY_VOLUME_NAME=${CARGO_REGISTRY_VOLUME_NAME:-"cargo-registry"} GRADLE_CACHE_VOLUME_NAME=${GRADLE_CACHE_VOLUME_NAME:-"gradle-cache"} ANDROID_CREDENTIALS_DIR=${ANDROID_CREDENTIALS_DIR:-""} CONTAINER_RUNNER=${CONTAINER_RUNNER:-"podman"} -# Temporarily do not use mold for linking by default due to it causing build errors. -# There's a separate issue (DES-1177) to address this problem. -# Build servers also opt out of this and instead use GNU ld. -USE_MOLD=${USE_MOLD:-"false"} SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" REPO_DIR="$( cd "$SCRIPT_DIR/.." && pwd )" @@ -47,11 +43,6 @@ case ${1-:""} in exit 1 esac -optional_mold="" -if [[ "$USE_MOLD" == "true" ]]; then - optional_mold="mold -run" -fi - set -x exec "$CONTAINER_RUNNER" run --rm -it \ -v "/$REPO_DIR:$REPO_MOUNT_TARGET:Z" \ @@ -59,4 +50,4 @@ exec "$CONTAINER_RUNNER" run --rm -it \ -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \ "${optional_gradle_cache_volume[@]}" \ "${optional_android_credentials_volume[@]}" \ - "$container_image_name" bash -c "$optional_mold $*" + "$container_image_name" bash -c "$*" diff --git a/ci/buildserver-build-android.sh b/ci/buildserver-build-android.sh index a2eb39a112..59381410b2 100755 --- a/ci/buildserver-build-android.sh +++ b/ci/buildserver-build-android.sh @@ -29,7 +29,7 @@ function upload { } function run_in_linux_container { - USE_MOLD=false ./building/container-run.sh linux "$@" + ./building/container-run.sh linux "$@" } # Builds the app artifacts and move them to the passed in `artifact_dir`. @@ -38,7 +38,6 @@ function build { ANDROID_CREDENTIALS_DIR=$ANDROID_CREDENTIALS_DIR \ CARGO_TARGET_VOLUME_NAME="cargo-target-android" \ CARGO_REGISTRY_VOLUME_NAME="cargo-registry-android" \ - USE_MOLD=false \ ./building/containerized-build.sh android --app-bundle --enable-play-publishing || return 1 mv dist/*.{aab,apk} "$artifact_dir" || return 1 diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index c4dc925a66..4a5cf6790f 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -103,7 +103,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 - USE_MOLD=false ./building/container-run.sh linux "$@" + ./building/container-run.sh linux "$@" else bash -c "$*" fi |