Merge branch 'fix-prepare-script-fails-if-relay-list-unchanged-droid-1941'

1 files changed, 19 insertions, 6 deletions

diff --git a/android/scripts/prepare-release.sh b/android/scripts/prepare-release.sh
index 455d43c87e..61dea58bff 100755
--- a/android/scripts/prepare-release.sh
+++ b/android/scripts/prepare-release.sh
@@ -39,23 +39,36 @@ if [[ $PRODUCT_VERSION != *"alpha"* &&
     exit 1
 fi
 
-echo "Generate relays.json"
+echo "### Generating relay list ###"
 mkdir -p dist-assets/relays
 cargo run -q -p mullvad-api --bin relay_list > dist-assets/relays/relays.json
+if [[ ! -f dist-assets/relays/relays.json ]]; then
+    echo "Error: Relay list missing."
+    exit 1
+elif git diff --quiet dist-assets/relays/relays.json; then
+    echo "Relay list unchanged, skipping commit."
+else
+    git add dist-assets/relays/relays.json
+    git commit -S -m "Add relay list to bundle with $PRODUCT_VERSION"
+fi
+echo ""
 
-git add dist-assets/relays/relays.json
-git commit -S -m "Add relay list to bundle with $PRODUCT_VERSION"
-
+echo "### Generating version information ###"
 echo "$PRODUCT_VERSION" > dist-assets/android-version-name.txt
 ANDROID_VERSION="$PRODUCT_VERSION" cargo run -q --bin mullvad-version versionCode > \
     dist-assets/android-version-code.txt
+if git diff --quiet dist-assets/android-version-*; then
+    echo "Error: Version information unchanged."
+    exit 1
+fi
 git commit -S -m "Update android app version to $PRODUCT_VERSION" \
     dist-assets/android-version-name.txt \
     dist-assets/android-version-code.txt
+echo ""
 
-
-echo "Tagging current git commit with release tag android/$PRODUCT_VERSION..."
+echo "### Tagging release as android/$PRODUCT_VERSION ###"
 git tag -s "android/$PRODUCT_VERSION" -m "android/$PRODUCT_VERSION"
+echo ""
 
 echo "===================================================="
 echo "| DONE preparing for a release!                    |"