diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-02-07 16:56:14 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-02-20 09:53:09 +0100 |
| commit | 4425d898e6009253a75d24c29cc3b596dca87d6c (patch) | |
| tree | 3248cba00e14c124bea7f31a025e3d528d004d09 /ci | |
| parent | 8462e940192c4ab0d016f4f2a149924ee88794b8 (diff) | |
| download | mullvadvpn-4425d898e6009253a75d24c29cc3b596dca87d6c.tar.xz mullvadvpn-4425d898e6009253a75d24c29cc3b596dca87d6c.zip | |
Build test executable in buildserver-build
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/buildserver-build.sh | 13 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 0f68577803..406fb2166e 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -100,7 +100,7 @@ build_ref() { # Make sure we have the latest Rust and Node toolchains before the build rustup update - version="$(cargo run -q --bin mullvad-version)" + version="$(cargo run -q --bin mullvad-version || return 0)" artifact_dir="dist/$version" mkdir -p "$artifact_dir" @@ -109,7 +109,10 @@ build_ref() { BUILD_ARGS+=(--universal) fi ./build.sh "${BUILD_ARGS[@]}" || return 0 - mv dist/*.{deb,rpm,exe,pkg} "$artifact_dir" + mv dist/*.{deb,rpm,exe,pkg} "$artifact_dir" || return 0 + + (gui/scripts/build-test-executable.sh && mv "dist/app-e2e-tests-$version"* "$artifact_dir") || \ + true case "$(uname -s)" in MINGW*|MSYS_NT*) @@ -123,7 +126,11 @@ build_ref() { Linux*) echo "Building ARM64 installers" TARGETS=aarch64-unknown-linux-gnu ./build.sh "${BUILD_ARGS[@]}" || return 0 - mv dist/*.{deb,rpm} "$artifact_dir" + mv dist/*.{deb,rpm} "$artifact_dir" || return 0 + + (gui/scripts/build-test-executable.sh aarch64-unknown-linux-gnu && \ + mv "dist/app-e2e-tests-$version"* "$artifact_dir") || \ + true ;; esac diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index 2bd1a29a8d..3b5e8ad09b 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -31,13 +31,13 @@ while true; do files=$(awk '{print $2}' < "$checksums_path") for file in $files; do file_upload_dir="$upload_path/$version" - if [[ ! $file =~ \.($BUILD_ARTIFACT_EXTENSIONS|asc)$ ]]; then + if [[ ! $file == MullvadVPN-* ]]; then file_upload_dir="$file_upload_dir/additional-files" fi rsync -av --rsh='ssh -p 1122' "$file" "build@releases.mullvad.net:$file_upload_dir/" || continue - if [[ $file =~ \.($BUILD_ARTIFACT_EXTENSIONS)$ ]]; then + if [[ $file == MullvadVPN-* ]]; then rm -f "$file.asc" gpg -u A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF --pinentry-mode loopback --sign --armor --detach-sign "$file" rsync -av --rsh='ssh -p 1122' "$file.asc" "build@releases.mullvad.net:$file_upload_dir/" || continue |