diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-05-20 17:42:57 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-05-20 17:42:57 +0200 |
| commit | 90ece563d6b865f84c64577543dacf44b83ce284 (patch) | |
| tree | 06a7df5816f322eae18cbbfc9bd1102b431a2643 /ci | |
| parent | 0cff36f58802eb10251ba2e739ff2dfb0a06a947 (diff) | |
| download | mullvadvpn-90ece563d6b865f84c64577543dacf44b83ce284.tar.xz mullvadvpn-90ece563d6b865f84c64577543dacf44b83ce284.zip | |
Make sure only correct files are uploaded
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/buildserver-build.sh | 3 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 01a88626e1..0de9077e25 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -15,6 +15,7 @@ # signtool sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /d "Mullvad VPN" /du https://github.com/mullvad/mullvadvpn-app#readme /f comodo.pfx /p <PASSWORD TO comodo.pfx> "%1" set -eu +shopt -s nullglob SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" BUILD_DIR="$SCRIPT_DIR/mullvadvpn-app" @@ -44,7 +45,7 @@ sign_win() { upload() { current_hash=$1 - for f in MullvadVPN-*; do + for f in MullvadVPN-*.{deb,rpm,exe,pkg}; do sha256sum "$f" > "$f.sha256" case "$(uname -s)" in # Linux is both the build and upload server. Just move directly to target dir diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index 9bbd14175c..58cbf6999d 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -9,7 +9,7 @@ cd $UPLOAD_DIR while true; do sleep 10 - for f_checksum in MullvadVPN-*.sha256; do + for f_checksum in MullvadVPN-*.{deb,rpm,exe,pkg}.sha256; do sleep 1 f="${f_checksum/.sha256/}" if ! sha256sum --quiet -c "$f_checksum"; then |