From cc58bceb843ac8f356fbea734cfa00b7c8959c2a Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 1 Jun 2022 15:47:57 -0700 Subject: [PATCH] Tweak build.sh --- .version | 1 - build.sh | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 .version diff --git a/.version b/.version deleted file mode 100644 index bfa363e..0000000 --- a/.version +++ /dev/null @@ -1 +0,0 @@ -1.8.4 diff --git a/build.sh b/build.sh index dfd3bea..a488446 100755 --- a/build.sh +++ b/build.sh @@ -494,7 +494,7 @@ host-jar() { check_submodules ARTIFACT="jar" - PKG_VERSION=$(cat .version) + PKG_VERSION=$(git describe --tags --abbrev=0) # Default to release BUILD_TYPE=${1:-release} if [[ $1 = *"docs"* ]]; then @@ -745,13 +745,12 @@ clean() find . -type d -name "__pycache__" -exec rm -rf {} + # Python pkg - cd pkg/pypi && ./build.sh clean + # cd pkg/pypi && ./build.sh clean } tag_release() { git tag -a $1 -m $2 - "$(git describe --tags --abbrev=0)" >> .version git push origin --tags }