diff options
| author | Linus Färnstrand <faern@faern.net> | 2022-10-06 16:47:52 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2022-10-10 11:55:56 +0200 |
| commit | 447793c6f8c1dd69486ef395475bede7e06adfee (patch) | |
| tree | be9d996846fb01269e3b936309a4ff76062e04fc | |
| parent | 7fbca24356da28bf97523090f3e93729e52bbb92 (diff) | |
| download | mullvadvpn-447793c6f8c1dd69486ef395475bede7e06adfee.tar.xz mullvadvpn-447793c6f8c1dd69486ef395475bede7e06adfee.zip | |
Update prepare-release.sh to not commit files we no longer change
| -rwxr-xr-x | prepare-release.sh | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/prepare-release.sh b/prepare-release.sh index 2a18f8f45b..888f21a686 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -13,7 +13,6 @@ for argument in "$@"; do case "$argument" in "--android") ANDROID="true" - VERSION_METADATA_ARGS+="--android " ;; "--desktop") DESKTOP="true" @@ -66,39 +65,11 @@ fi echo "Updating version in metadata files..." ./version-metadata.sh inject $PRODUCT_VERSION $VERSION_METADATA_ARGS -echo "Syncing Cargo.lock with new version numbers" -source env.sh "" -# If cargo exits with a non zero exit status and it's not a timeout (exit code 124) it's an error -set +e -timeout 5s cargo build -if [[ $? != 0 && $? != 124 ]]; then - exit 1 -fi -set -e - -echo "Commiting metadata changes to git..." - -git commit -S -m "Update crate versions to $PRODUCT_VERSION" \ - mullvad-daemon/Cargo.toml \ - mullvad-cli/Cargo.toml \ - mullvad-problem-report/Cargo.toml \ - mullvad-setup/Cargo.toml \ - mullvad-exclude/Cargo.toml \ - talpid-openvpn-plugin/Cargo.toml \ - Cargo.lock - if [[ "$DESKTOP" == "true" ]]; then git commit -S -m "Update desktop app versions to $PRODUCT_VERSION" \ - gui/package.json \ - gui/package-lock.json \ dist-assets/windows/version.h fi -if [[ "$ANDROID" == "true" ]]; then - git commit -S -m "Update Android app version to $PRODUCT_VERSION" \ - android/app/build.gradle.kts -fi - NEW_TAGS="" if [[ "$ANDROID" == "true" ]]; then |
