diff options
| author | Oskar <oskar@mullvad.net> | 2025-10-27 12:23:08 +0100 |
|---|---|---|
| committer | Oskar <oskar@mullvad.net> | 2025-10-28 12:04:58 +0100 |
| commit | f1f96ae323a7a355a773a4e66f35d0e83d1265b7 (patch) | |
| tree | 7fafd2e344e8bd10880ece7c465e00e3c971e817 /desktop/scripts | |
| parent | 68193ec8a6bb74969345749dd5229e6ba7241e81 (diff) | |
| download | mullvadvpn-f1f96ae323a7a355a773a4e66f35d0e83d1265b7.tar.xz mullvadvpn-f1f96ae323a7a355a773a4e66f35d0e83d1265b7.zip | |
Move BUILDSERVER_BUILDUSER variable to release-config.sh
Diffstat (limited to 'desktop/scripts')
| -rwxr-xr-x | desktop/scripts/release/publish-metadata-to-api | 5 | ||||
| -rw-r--r-- | desktop/scripts/release/release-config.sh | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/desktop/scripts/release/publish-metadata-to-api b/desktop/scripts/release/publish-metadata-to-api index 02649e67d0..20afe25bc4 100755 --- a/desktop/scripts/release/publish-metadata-to-api +++ b/desktop/scripts/release/publish-metadata-to-api @@ -13,6 +13,9 @@ if [ $# -lt 3 ]; then exit 1 fi +# shellcheck source=desktop/scripts/release/release-config.sh +source "$SCRIPT_DIR/release-config.sh" + LOCAL_METADATA_DIR=$1 BUILD_SERVER_HOST=$2 METADATA_SERVER_HOST=$3 @@ -21,8 +24,6 @@ BUILDSERVER_TMP_DIR="/tmp/desktop-upload-release" BUILDSERVER_METADATA_DIR="$BUILDSERVER_TMP_DIR/metadata" METADATA_SERVER_METADATA_DIR="desktop/metadata" -BUILDSERVER_BUILDUSER="build" - RSYNC_OPTIONS=(-av --mkpath) METADATA_SERVER_RSYNC_OPTIONS=("${RSYNC_OPTIONS[@]}" '--rsh="ssh -p 1122"') diff --git a/desktop/scripts/release/release-config.sh b/desktop/scripts/release/release-config.sh index 3b412f35f7..45279a8b62 100644 --- a/desktop/scripts/release/release-config.sh +++ b/desktop/scripts/release/release-config.sh @@ -13,3 +13,6 @@ export ARTIFACT_DIR="$DATA_DIR/artifacts" # Mullvad code signing key and fingerprint export MULLVAD_CODE_SIGNING_KEY_PATH="../../../ci/keys/1.mullvad_signing.pub" export MULLVAD_CODE_SIGNING_KEY_FINGERPRINT="A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF" + +# The user on the buildserver that builds and uploads artifacts to the cdn servers +export BUILDSERVER_BUILDUSER="build" |