From 3f22f16dcda8c7ee3001aba9f25f29dd1f943ea5 Mon Sep 17 00:00:00 2001 From: a-wing <1@233.email> Date: Sat, 16 Nov 2024 19:56:46 +0800 Subject: [PATCH] feat(infra): add prerelease --- .github/workflows/release.yml | 8 ++++++-- nfpm/live777.yaml | 2 ++ nfpm/liveman.yaml | 2 ++ nfpm/net4mqtt.yaml | 2 ++ nfpm/whepfrom.yaml | 2 ++ nfpm/whipinto.yaml | 2 ++ 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0fad118..4df5014 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,8 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v4 + with: + fetch-depth: 0 - uses: actions/setup-node@v4 with: @@ -58,7 +60,7 @@ jobs: run: | VERSION=${GITHUB_REF_NAME} if expr "${VERSION}" : '[^0-9]*$' > /dev/null; then - VERSION=v0.0.0 + VERSION=`git describe --tags` fi echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "version is: ${VERSION}" @@ -182,7 +184,9 @@ jobs: run: | echo "NFPM_ARCH=${{ matrix.job.nfpm }}" >> $GITHUB_ENV echo "NFPM_TARGET=${{ matrix.job.target }}" >> $GITHUB_ENV - echo "NFPM_VERSION=${{ env.VERSION }}" >> $GITHUB_ENV + echo "NFPM_VERSION=`git describe --tags | cut -d - -f 1`" >> $GITHUB_ENV + echo "NFPM_RELEASE=`git describe --tags | cut -d - -f 2`" >> $GITHUB_ENV + echo "NFPM_PRERELEASE=`git describe --tags | cut -d - -f 3`" >> $GITHUB_ENV - name: Build nFPM config if: ${{ matrix.job.nfpm }} diff --git a/nfpm/live777.yaml b/nfpm/live777.yaml index 0408ac4..f2c58d8 100644 --- a/nfpm/live777.yaml +++ b/nfpm/live777.yaml @@ -2,6 +2,8 @@ name: "live777" arch: "${NFPM_ARCH}" platform: "linux" version: "${NFPM_VERSION}" +release: "${NFPM_RELEASE}" +prerelease: "${NFPM_PRERELEASE}" section: "utility" priority: "optional" maintainer: "BinBat Ltd " diff --git a/nfpm/liveman.yaml b/nfpm/liveman.yaml index 2e185fe..34bca4a 100644 --- a/nfpm/liveman.yaml +++ b/nfpm/liveman.yaml @@ -2,6 +2,8 @@ name: "liveman" arch: "${NFPM_ARCH}" platform: "linux" version: "${NFPM_VERSION}" +release: "${NFPM_RELEASE}" +prerelease: "${NFPM_PRERELEASE}" section: "utility" priority: "optional" maintainer: "BinBat Ltd " diff --git a/nfpm/net4mqtt.yaml b/nfpm/net4mqtt.yaml index e341c5c..76504cd 100644 --- a/nfpm/net4mqtt.yaml +++ b/nfpm/net4mqtt.yaml @@ -2,6 +2,8 @@ name: "net4mqtt" arch: "${NFPM_ARCH}" platform: "linux" version: "${NFPM_VERSION}" +release: "${NFPM_RELEASE}" +prerelease: "${NFPM_PRERELEASE}" section: "utility" priority: "optional" maintainer: "BinBat Ltd " diff --git a/nfpm/whepfrom.yaml b/nfpm/whepfrom.yaml index 1c0b9be..3d477c3 100644 --- a/nfpm/whepfrom.yaml +++ b/nfpm/whepfrom.yaml @@ -2,6 +2,8 @@ name: "whepfrom" arch: "${NFPM_ARCH}" platform: "linux" version: "${NFPM_VERSION}" +release: "${NFPM_RELEASE}" +prerelease: "${NFPM_PRERELEASE}" section: "utility" priority: "optional" maintainer: "BinBat Ltd " diff --git a/nfpm/whipinto.yaml b/nfpm/whipinto.yaml index 747ba95..5a91e78 100644 --- a/nfpm/whipinto.yaml +++ b/nfpm/whipinto.yaml @@ -2,6 +2,8 @@ name: "whipinto" arch: "${NFPM_ARCH}" platform: "linux" version: "${NFPM_VERSION}" +release: "${NFPM_RELEASE}" +prerelease: "${NFPM_PRERELEASE}" section: "utility" priority: "optional" maintainer: "BinBat Ltd "