summaryrefslogtreecommitdiffhomepage
path: root/ci
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2025-08-07 15:56:23 +0200
committerLinus Färnstrand <linus@mullvad.net>2025-08-08 09:29:15 +0200
commit8e949bf83659c1bc598054f2b34ae98cc13334bb (patch)
treef8da04c4d685e0231f9f5770871e93f653697203 /ci
parenta7c4bbbd292c8049f84a98736c51b62444f14914 (diff)
downloadmullvadvpn-8e949bf83659c1bc598054f2b34ae98cc13334bb.tar.xz
mullvadvpn-8e949bf83659c1bc598054f2b34ae98cc13334bb.zip
Remove all usage of USE_MOLD env var for containers
Diffstat (limited to 'ci')
-rwxr-xr-xci/buildserver-build-android.sh3
-rwxr-xr-xci/buildserver-build.sh2
2 files changed, 2 insertions, 3 deletions
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