diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2021-11-09 09:49:44 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2021-11-09 09:49:44 +0100 |
| commit | 43f278edf6e2723caa09c8217211490462bab5d8 (patch) | |
| tree | d0aadfac14232b43fce382567037dfa1579d762f | |
| parent | 32d7aeb64182e38da83a25c246eae5adbb6ec1e0 (diff) | |
| parent | 24c50184da05598cc30ae87d6e5f6f24e4300a87 (diff) | |
| download | mullvadvpn-43f278edf6e2723caa09c8217211490462bab5d8.tar.xz mullvadvpn-43f278edf6e2723caa09c8217211490462bab5d8.zip | |
Merge branch 'stop-uploading-to-build.mullvad.net'
| -rwxr-xr-x | ci/buildserver-upload.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index dd664c75da..cf2a88a0d6 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -17,23 +17,22 @@ while true; do continue fi - version=$(echo $f | sed -Ee 's/MullvadVPN-(.*)(\.exe|\.pkg|_amd64\.deb|_x86_64\.rpm|\.apk|\.aab)/\1/g') + version=$(echo "$f" | sed -Ee 's/MullvadVPN-(.*)(\.exe|\.pkg|_amd64\.deb|_x86_64\.rpm|\.apk|\.aab)/\1/g') if [[ $version == *"-dev-"* ]]; then upload_path="builds" else upload_path="releases" fi - ssh build.mullvad.net mkdir -p "app/$version" || continue - scp -pB "$f" build.mullvad.net:app/$version/ || continue rsync -av --rsh='ssh -p 1122' "$f" "build@releases.mullvad.net:$upload_path/$version/" || continue rm -f "$f.asc" gpg -u A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF --pinentry-mode loopback --sign --armor --detach-sign "$f" - scp -pB "$f.asc" build.mullvad.net:app/$version/ || true rsync -av --rsh='ssh -p 1122' "$f.asc" "build@releases.mullvad.net:$upload_path/$version/" || continue yes | rm "$f" "$f_checksum" "$f.asc" done + + # Upload PDB files (Windows debugging info) for f_checksum in pdb-*.sha256; do sleep 1 f="${f_checksum/.sha256/}" @@ -42,9 +41,7 @@ while true; do continue fi - ssh build.mullvad.net mkdir -p app/pdb || continue - scp -pB "$f" build.mullvad.net:app/pdb/ || continue - + rsync -av --rsh='ssh -p 1122' "$f" "build@releases.mullvad.net:builds/pdb/" || continue yes | rm "$f" "$f_checksum" done done |