fix nfpm (woodpecker-ci#788)

fix woodpecker-ci#774
earl-warren · Feb 24, 2022 · f97f6f2 · f97f6f2
1 parent 28e96a3
commit f97f6f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -5,8 +5,10 @@ TARGETOS ?= linux
 TARGETARCH ?= amd64
 
 VERSION ?= next
+VERSION_NUMBER ?= 0.0.0
 ifneq ($(CI_COMMIT_TAG),)
 	VERSION := $(CI_COMMIT_TAG:v%=%)
+	VERSION_NUMBER := ${VERSION}
 endif
 
 # append commit-sha to next version

diff --git a/nfpm/nfpm-agent.yml b/nfpm/nfpm-agent.yml
@@ -1,7 +1,7 @@
 name: woodpecker-agent
 arch: amd64
 platform: linux
-version: v${WOODPECKER_VERSION}
+version: ${VERSION_NUMBER}
 description: Woodpecker Agent
 homepage: https://github.com/woodpecker-ci/woodpecker
 license: Apache 2.0

diff --git a/nfpm/nfpm-cli.yml b/nfpm/nfpm-cli.yml
@@ -1,7 +1,7 @@
 name: woodpecker-cli
 arch: amd64
 platform: linux
-version: v${WOODPECKER_VERSION}
+version: ${VERSION_NUMBER}
 description: Woodpecker CLI
 homepage: https://github.com/woodpecker-ci/woodpecker
 license: Apache 2.0

diff --git a/nfpm/nfpm-server.yml b/nfpm/nfpm-server.yml
@@ -1,7 +1,7 @@
 name: woodpecker-server
 arch: amd64
 platform: linux
-version: v${WOODPECKER_VERSION}
+version: ${VERSION_NUMBER}
 description: Woodpecker Server
 homepage: https://github.com/woodpecker-ci/woodpecker
 license: Apache 2.0