Merge branch 'improve-release-scripts'

3 files changed, 6 insertions, 4 deletions

diff --git a/desktop/scripts/release/1-prepare-release b/desktop/scripts/release/1-prepare-release
index 4becc19d06..9f00a7e929 100755
--- a/desktop/scripts/release/1-prepare-release
+++ b/desktop/scripts/release/1-prepare-release
@@ -61,9 +61,9 @@ function check_changelog {
     previous_version=$(grep -oP '## \[\K[^\]]+' $changelog_path | head -2 | tail -1)
 
     log_header "Changelog since previous release"
-    git --no-pager diff -U10 "$previous_version"..HEAD -- $changelog_path
+    git --no-pager diff -U30 "$previous_version"..HEAD -- $changelog_path
 
-    log_info "\nThe changelog should only contain changes in the \"Unreleased\" section, unless it's a correction of a previous message."
+    log_info "\nThe changelog should only contain changes in the \"Unreleased\" section, unless it's a correction of a previous message. If something is added to the section of an already published release, double check that the change was actually included in that release. Changes can be made in another terminal/editor while this script is waiting for input, press 'r' to reprint the new diff after making changes."
     read -r -n 1 -p "Does this look good? (y: yes, q: abort, r: reload): " response
     echo ""
 
diff --git a/desktop/scripts/release/2-push-release-tag b/desktop/scripts/release/2-create-and-push-tag
index a5115ed860..b6bb4a1386 100755
--- a/desktop/scripts/release/2-push-release-tag
+++ b/desktop/scripts/release/2-create-and-push-tag
@@ -25,3 +25,5 @@ function push_tag {
 
 git verify-commit HEAD
 push_tag
+
+log_success "Follow build progress here: https://releases.mullvad.net/desktop/releases/$PRODUCT_VERSION"
diff --git a/desktop/scripts/release/3-verify-build b/desktop/scripts/release/3-verify-build
index bee63a5730..d4e8dce800 100755
--- a/desktop/scripts/release/3-verify-build
+++ b/desktop/scripts/release/3-verify-build
@@ -24,7 +24,7 @@ function verify_repository_versions {
   fi
 
   deb_version_output=$(./print-package-versions --deb "${print_versions_args[@]}")
-  deb_version=$(echo "$deb_version_output" | grep mullvad-vpn | awk '{print $2}')
+  deb_version=$(echo "$deb_version_output" | grep mullvad-vpn | awk '{print $2}' | sed 's/~/-/')
 
   if [[ "$deb_version" != "$PRODUCT_VERSION" ]]; then
     log_error "Incorrect deb version in repository ($deb_version)"
@@ -33,7 +33,7 @@ function verify_repository_versions {
   fi
 
   rpm_version_output=$(./print-package-versions --rpm "${print_versions_args[@]}")
-  rpm_version=$(echo "$rpm_version_output" | grep mullvad-vpn | awk '{print $2}')
+  rpm_version=$(echo "$rpm_version_output" | grep mullvad-vpn | awk '{print $2}' | sed 's/~/-/')
 
   if [[ "$rpm_version" != "$PRODUCT_VERSION-1" ]]; then
     log_error "Incorrect rpm version in repository ($rpm_version)"