Refactor agent V3 release workflow

nginx · Aug 12, 2024 · 9b3cc1b · 9b3cc1b
1 parent 0f43afc
commit 9b3cc1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml
@@ -11,6 +11,10 @@ on:
         description: 'Package version number'
         default: "3.0.0"
         type: string
+      packageBuildNo:
+        description: 'Package Build number'
+        default: "1"
+        type: string
       uploadAzure:
         description: 'Publish packages Azure storage'
         default: true
@@ -238,6 +242,7 @@ jobs:
           GPG_KEY: ${{ secrets.INDIGO_GPG_AGENT }}
           NFPM_SIGNING_KEY_FILE: .key.asc
           VERSION: ${{ inputs.packageVersion }}
+          PACKAGE_BUILD: ${{ inputs.packageBuildNo }}
         run: |
           export PATH=$PATH:~/go/bin
           echo "$GPG_KEY" | base64 --decode > ${NFPM_SIGNING_KEY_FILE}

diff --git a/Makefile.packaging b/Makefile.packaging
@@ -8,7 +8,8 @@ GITHUB_PACKAGES_DIR := ./build/github/packages
 AZURE_PACKAGES_DIR  := ./build/azure/packages
 BINARY_PATH         := $(BUILD_DIR)/$(BINARY_NAME)
 GPG_PUBLIC_KEY      := .key
-PACKAGE_VERSION     := $(shell echo ${VERSION} | tr -d 'v')
+PACKAGE_BUILD       ?= 1
+PACKAGE_VERSION     := $(shell echo ${VERSION} | tr -d 'v')-$(PACKAGE_BUILD)
 TARBALL_NAME        := $(PACKAGE_PREFIX)v3.tar.gz
 
 DEB_DISTROS         ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11