diff options
| author | Albin <albin@mullvad.net> | 2025-06-30 09:06:36 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-06-30 11:01:00 +0200 |
| commit | 1e692852b0bd7e6f255f767ddd82c918f0851a03 (patch) | |
| tree | fe96b29ce9fc0b5de2969d18c9065b22b137b06b /android/scripts | |
| parent | b455571c999cae71597c6a722c2d5cc54e7f12c2 (diff) | |
| download | mullvadvpn-1e692852b0bd7e6f255f767ddd82c918f0851a03.tar.xz mullvadvpn-1e692852b0bd7e6f255f767ddd82c918f0851a03.zip | |
Handle missing or unchanged relay list in prepare script
Diffstat (limited to 'android/scripts')
| -rwxr-xr-x | android/scripts/prepare-release.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/android/scripts/prepare-release.sh b/android/scripts/prepare-release.sh index 455d43c87e..725ea5eb8d 100755 --- a/android/scripts/prepare-release.sh +++ b/android/scripts/prepare-release.sh @@ -42,9 +42,15 @@ fi echo "Generate relays.json" mkdir -p dist-assets/relays cargo run -q -p mullvad-api --bin relay_list > dist-assets/relays/relays.json - -git add dist-assets/relays/relays.json -git commit -S -m "Add relay list to bundle with $PRODUCT_VERSION" +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 "$PRODUCT_VERSION" > dist-assets/android-version-name.txt ANDROID_VERSION="$PRODUCT_VERSION" cargo run -q --bin mullvad-version versionCode > \ |