diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-07 13:34:01 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-07 13:34:01 +0200 |
| commit | 101da5291a86a05dd86c662a9171aa4964b142fb (patch) | |
| tree | d690a47f7ea614eb536d08fb1548f4fa99a2c4b9 | |
| parent | da9b70071c8eac573e2ff585589ac4589176c002 (diff) | |
| parent | f647c719a180fb5903eec0455a47029b263fd2eb (diff) | |
| download | mullvadvpn-101da5291a86a05dd86c662a9171aa4964b142fb.tar.xz mullvadvpn-101da5291a86a05dd86c662a9171aa4964b142fb.zip | |
Merge branch 'fix-prepare-script-untracked-relay-list'
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | android/build.sh | 5 | ||||
| -rwxr-xr-x | android/scripts/prepare-release.sh | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 2b1d8753f1..9ce0bc4ab1 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ /android/keystore.properties /android/local.properties /android/play-api-key.json +/android/credentials/ /wireguard/libwg/libwg.exp /wireguard/libwg/exports.def **/.vs/ diff --git a/android/build.sh b/android/build.sh index c1c29f55b4..c6c04ac702 100755 --- a/android/build.sh +++ b/android/build.sh @@ -5,6 +5,11 @@ set -eu SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" +if test -n "$(git status --porcelain)"; then + echo "Dirty working directory! Will not accept that for an official release." + exit 1 +fi + echo "Computing build version..." echo "" PRODUCT_VERSION=$(cargo run -q --bin mullvad-version versionName) diff --git a/android/scripts/prepare-release.sh b/android/scripts/prepare-release.sh index 61dea58bff..2bab05fd4c 100755 --- a/android/scripts/prepare-release.sh +++ b/android/scripts/prepare-release.sh @@ -26,7 +26,7 @@ if [[ -z ${PRODUCT_VERSION+x} ]]; then exit 1 fi -if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then +if test -n "$(git status --porcelain)"; then echo "Dirty working directory! Will not accept that for an official release." exit 1 fi @@ -45,7 +45,7 @@ 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 +elif test ! -n "$(git status --porcelain | grep dist-assets/relays/)"; then echo "Relay list unchanged, skipping commit." else git add dist-assets/relays/relays.json |