diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-09-02 13:52:15 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-02 13:52:15 +0200 |
| commit | 90f6da965c2deeddbd3c12ee26c2e7a3b344fda8 (patch) | |
| tree | 1fc4d46d7f7bda3d05722adbf6c03f98fb8e8174 | |
| parent | 01904bd607705d4e457688f2da2171bd93c21c77 (diff) | |
| parent | a3a5c8173d6086907e8c52e19a97a8fd0e129d0c (diff) | |
| download | mullvadvpn-90f6da965c2deeddbd3c12ee26c2e7a3b344fda8.tar.xz mullvadvpn-90f6da965c2deeddbd3c12ee26c2e7a3b344fda8.zip | |
Merge branch 'lock-dev-hash-length'
| -rwxr-xr-x | build-apk.sh | 2 | ||||
| -rwxr-xr-x | build.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build-apk.sh b/build-apk.sh index de89f72260..2459fe9935 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -26,7 +26,7 @@ else fi if [[ "$BUILD_TYPE" == "debug" || "$(git describe)" != "$PRODUCT_VERSION" ]]; then - GIT_COMMIT="$(git rev-parse --short HEAD)" + GIT_COMMIT="$(git rev-parse HEAD | head -c 6)" PRODUCT_VERSION="${PRODUCT_VERSION}-dev-${GIT_COMMIT}" echo "Modifying product version to $PRODUCT_VERSION" fi @@ -54,7 +54,7 @@ else fi if [[ "$BUILD_MODE" == "dev" || $(git describe) != "$PRODUCT_VERSION" ]]; then - GIT_COMMIT=$(git rev-parse --short HEAD) + GIT_COMMIT=$(git rev-parse HEAD | head -c 6) PRODUCT_VERSION="$PRODUCT_VERSION-dev-$GIT_COMMIT" echo "Modifying product version to $PRODUCT_VERSION" else |