diff --git a/.github/workflows/jar.yaml b/.github/workflows/jar.yaml index 0d979b6..e494b01 100644 --- a/.github/workflows/jar.yaml +++ b/.github/workflows/jar.yaml @@ -15,11 +15,8 @@ jobs: - name: Install JDK run: sudo apt install default-jdk - - name: Set env - run: echo "RELEASE_VERSION=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV - - name: Build - run: PKG_VER_TAG=$RELEASE_VERSION ./build.sh host-jar "release" + run: ./build.sh host-jar "release" - uses: actions/upload-artifact@v2 with: diff --git a/.version b/.version new file mode 100644 index 0000000..347f583 --- /dev/null +++ b/.version @@ -0,0 +1 @@ +1.4.1 diff --git a/build.sh b/build.sh index 7839ce5..0a8c361 100755 --- a/build.sh +++ b/build.sh @@ -505,9 +505,7 @@ host-jar() export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 javac -Xlint:deprecation com/zerotier/sockets/*.java - PKG_VER_TAG="${PKG_VER_TAG:-"$(git describe --abbrev=0)"}" - - jar cf libzt-$PKG_VER_TAG.jar $SHARED_LIB_NAME com/zerotier/sockets/*.class + jar cf libzt-"$(cat .version)".jar $SHARED_LIB_NAME com/zerotier/sockets/*.class rm -rf com $SHARED_LIB_NAME cd - # Copy JAR to dist/ @@ -726,6 +724,13 @@ 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 +} + list() { IFS=$'\n'