From 80fe9e4e4e1effbe3b271778823476c206bc7741 Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Sat, 7 Jun 2025 00:14:18 -0400 Subject: [PATCH] Fix tagging --- .github/workflows/ant-latest.yml | 2 ++ .github/workflows/ant.yml | 2 ++ i2pversion | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ant-latest.yml b/.github/workflows/ant-latest.yml index 7f402e5..865fdc3 100644 --- a/.github/workflows/ant-latest.yml +++ b/.github/workflows/ant-latest.yml @@ -13,6 +13,8 @@ on: jobs: nsis-jdk22: + env: + GITHUB_TAG: ${{ github.ref_name }} runs-on: windows-latest steps: - uses: Vampire/setup-wsl@v3 diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 8c2229b..af94f70 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -14,6 +14,8 @@ jobs: nsis: runs-on: windows-latest + env: + GITHUB_TAG: ${{ github.ref_name }} steps: - uses: Vampire/setup-wsl@v3 with: diff --git a/i2pversion b/i2pversion index 7733295..8169f52 100644 --- a/i2pversion +++ b/i2pversion @@ -2,8 +2,9 @@ JNA_VERSION=5.12.1 export JNA_VERSION=5.12.1 - -export GITHUB_TAG=$(git describe --tags --abbrev=0 | sed 's|i2p||g' | tr -d [a-z-]) +if [ -z "$GITHUB_TAG" ]; then + export GITHUB_TAG=$(git describe --tags --abbrev=0 | sed 's|i2p||g' | tr -d [a-z-]) +fi if [ -z "$VERSIONMAJOR" ]; then VERSIONMAJOR=$(echo "$GITHUB_TAG" | cut -d . -f 1) fi