diff options
| author | Albin <albin@mullvad.net> | 2023-09-19 10:42:01 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-09-21 11:27:00 +0200 |
| commit | 9bf9ae8c6ce32c6f049700eaa79da410ef807a37 (patch) | |
| tree | e6a302b2f6f80f9ef9de3881733656077e405c42 | |
| parent | 9ba1bd01efddb6a146eeeea59e177b614095c350 (diff) | |
| download | mullvadvpn-9bf9ae8c6ce32c6f049700eaa79da410ef807a37.tar.xz mullvadvpn-9bf9ae8c6ce32c6f049700eaa79da410ef807a37.zip | |
Fix call to generate version
| -rwxr-xr-x | ci/buildserver-build-android.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/buildserver-build-android.sh b/ci/buildserver-build-android.sh index ff788a4454..04a2d05e26 100755 --- a/ci/buildserver-build-android.sh +++ b/ci/buildserver-build-android.sh @@ -28,6 +28,10 @@ function upload { mv "${files[@]}" "$checksums_path" "$UPLOAD_DIR/" } +function run_in_linux_container { + USE_MOLD=false ./building/container-run.sh linux "$@" +} + # Builds the app artifacts and move them to the passed in `artifact_dir`. # Must pass `artifact_dir` to show where to move the built artifacts. function build { @@ -82,7 +86,7 @@ function build_ref { # podman appends a trailing carriage return to the output. So we use `tr` to strip it local version="" - version="$(run_in_build_env cargo run -q --bin mullvad-version | tr -d "\r" || return 1)" + version="$(run_in_linux_container cargo run -q --bin mullvad-version | tr -d "\r" || return 1)" local artifact_dir="dist/$version" mkdir -p "$artifact_dir" |