diff options
| author | Linus Färnstrand <faern@faern.net> | 2023-03-03 15:01:52 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-03-03 15:48:35 +0100 |
| commit | ac33d3df5f1c5e2ffaf3e4ae887750638a716acf (patch) | |
| tree | e57c7b22da6ea6e4f8a2d82e9e1e474cd336f77d | |
| parent | f19296b75bc393a520af934426a4b27a16d7e889 (diff) | |
| download | mullvadvpn-ac33d3df5f1c5e2ffaf3e4ae887750638a716acf.tar.xz mullvadvpn-ac33d3df5f1c5e2ffaf3e4ae887750638a716acf.zip | |
Adjust build and upload scripts to work on new build server
| -rwxr-xr-x | ci/buildserver-build.sh | 7 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index f807741de5..b8f1a699c2 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -17,7 +17,7 @@ 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="/home/upload/upload" +UPLOAD_DIR="$SCRIPT_DIR/upload" BRANCHES_TO_BUILD=("origin/main") @@ -189,7 +189,10 @@ build_ref() { yes | rm -r "$artifact_dir" touch "$LAST_BUILT_DIR/$current_hash" - echo "Successfully finished build at $(date)" + + echo "" + echo "Successfully finished building $version at $(date)" + echo "" } cd "$BUILD_DIR" diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index a5dafb96bb..a2a33aba98 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -5,8 +5,11 @@ shopt -s nullglob CODE_SIGNING_KEY_FINGERPRINT="A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF" UPLOAD_SERVER="releases.mullvad.net" -UPLOAD_DIR="/home/upload/upload" -cd $UPLOAD_DIR + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +UPLOAD_DIR="$SCRIPT_DIR/upload" + +cd "$UPLOAD_DIR" while true; do sleep 10 |