Add workaround to get tagged version in GitHub workflow script

This commit is contained in:
Joseph Henry
2021-05-18 23:03:56 -07:00
parent 0e2f5b6f1e
commit 4bad93c95b
2 changed files with 13 additions and 3 deletions

View File

@@ -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

View File

@@ -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/