diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-11-15 09:52:27 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-11-15 09:52:27 +0100 |
| commit | 2a785f3b7f9ba55272dd151e47777ebedea8597e (patch) | |
| tree | eb5ebd7ba14da48a044bf1709991c0721b478438 | |
| parent | ebba1b9769a0c8b5ec662d87269d632d54076357 (diff) | |
| parent | 7b758371ae602fb6721f648208816e76c756860d (diff) | |
| download | mullvadvpn-2a785f3b7f9ba55272dd151e47777ebedea8597e.tar.xz mullvadvpn-2a785f3b7f9ba55272dd151e47777ebedea8597e.zip | |
Merge branch 'make-buildserver-build-less-hardcoded'
| -rwxr-xr-x | ci/buildserver-build.sh | 1 | ||||
| -rw-r--r-- | ci/buildserver-config.sh | 10 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index b8a0807d77..db172031eb 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -17,7 +17,6 @@ shopt -s nullglob SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BUILD_DIR="$SCRIPT_DIR/mullvadvpn-app" LAST_BUILT_DIR="$SCRIPT_DIR/last-built" -UPLOAD_DIR="$SCRIPT_DIR/upload" BRANCHES_TO_BUILD=("origin/main") diff --git a/ci/buildserver-config.sh b/ci/buildserver-config.sh index eef67d84d6..789a9b98d2 100644 --- a/ci/buildserver-config.sh +++ b/ci/buildserver-config.sh @@ -16,3 +16,13 @@ export SUPPORTED_DEB_CODENAMES export DEV_LINUX_REPOSITORY_SERVERS=("se-got-cdn-001.devmole.eu" "se-got-cdn-002.devmole.eu") export STAGING_LINUX_REPOSITORY_SERVERS=("se-got-cdn-001.stagemole.eu" "se-got-cdn-002.stagemole.eu") export PRODUCTION_LINUX_REPOSITORY_SERVERS=("se-got-cdn-111.mullvad.net" "se-mma-cdn-101.mullvad.net") + +# What container volumes cargo should put caches in. +# Specify differently if running multiple builds in parallel on one machine, +# so they don't use the same cache. +export CARGO_TARGET_VOLUME_NAME="cargo-target" +export CARGO_REGISTRY_VOLUME_NAME="cargo-registry" + +# Where buildserver-build.sh should move artifacts (on Linux) and where +# buildserver-upload.sh should pick artifacts to upload +export UPLOAD_DIR="PLEASE CONFIGURE ME" diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index 67abb3827b..2aee7e0845 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -6,7 +6,8 @@ shopt -s nullglob CODE_SIGNING_KEY_FINGERPRINT="A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -UPLOAD_DIR="$SCRIPT_DIR/upload" + +source "$SCRIPT_DIR/buildserver-config.sh" cd "$UPLOAD_DIR" |