summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-09-13 21:38:56 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-09-14 13:02:11 +0200
commit0cb91e05e3665ed215624bda15293e8eb9058a04 (patch)
treee6aaee6ab1f9354f2c2e8424fd7f88e8c9d87f87
parent3516aaba4c6dd665f8ca0025a1e0d392b86e605a (diff)
downloadmullvadvpn-0cb91e05e3665ed215624bda15293e8eb9058a04.tar.xz
mullvadvpn-0cb91e05e3665ed215624bda15293e8eb9058a04.zip
Add -dev-<commit> also to signed builds not on a tag commit
-rwxr-xr-xbuild.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 4d53194965..762a01902a 100755
--- a/build.sh
+++ b/build.sh
@@ -58,13 +58,16 @@ if [[ "${1:-""}" != "--dev-build" ]]; then
cargo +stable clean
else
echo "!! Development build. Not for general distribution !!"
- GIT_COMMIT=$(git rev-parse --short HEAD)
- PRODUCT_VERSION="$PRODUCT_VERSION-dev-$GIT_COMMIT"
-
unset CSC_LINK CSC_KEY_PASSWORD
export CSC_IDENTITY_AUTO_DISCOVERY=false
fi
+if [[ "${1:-""}" == "--dev-build" || $(git describe) != "$PRODUCT_VERSION" ]]; then
+ GIT_COMMIT=$(git rev-parse --short HEAD)
+ PRODUCT_VERSION="$PRODUCT_VERSION-dev-$GIT_COMMIT"
+ echo "Modifying product version to $PRODUCT_VERSION"
+fi
+
echo "Building Mullvad VPN $PRODUCT_VERSION"
SEMVER_VERSION=$(echo $PRODUCT_VERSION | sed -Ee 's/($|-.*)/.0\1/g')