diff --git a/.github/workflows/jar.yaml b/.github/workflows/jar.yaml index 5421229..dc359b7 100644 --- a/.github/workflows/jar.yaml +++ b/.github/workflows/jar.yaml @@ -15,6 +15,13 @@ jobs: - name: Install JDK run: sudo apt install default-jdk - - name: Build - run: ./build.sh host-jar "release" + - name: Set env + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + + - name: Build + run: PKG_VER_TAG=$RELEASE_VERSION ./build.sh host-jar "release" + + - uses: actions/upload-artifact@v2 + with: + path: dist diff --git a/build.sh b/build.sh index 6f367dc..7839ce5 100755 --- a/build.sh +++ b/build.sh @@ -504,7 +504,10 @@ host-jar() cd $JAVA_JAR_DIR export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 javac -Xlint:deprecation com/zerotier/sockets/*.java - jar cf libzt-"$(git describe --abbrev=0)".jar $SHARED_LIB_NAME com/zerotier/sockets/*.class + + PKG_VER_TAG="${PKG_VER_TAG:-"$(git describe --abbrev=0)"}" + + jar cf libzt-$PKG_VER_TAG.jar $SHARED_LIB_NAME com/zerotier/sockets/*.class rm -rf com $SHARED_LIB_NAME cd - # Copy JAR to dist/