From f97f6f25b3091570acf36d3071f550b458df3029 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 24 Feb 2022 15:35:11 +0100 Subject: [PATCH] fix nfpm (#788) fix #774 --- Makefile | 2 ++ nfpm/nfpm-agent.yml | 2 +- nfpm/nfpm-cli.yml | 2 +- nfpm/nfpm-server.yml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a9b38ebfb..3f23c4abf 100644 --- 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 index ce0d72602..dd6baefeb 100644 --- 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 index 33baff8b9..0d6685285 100644 --- 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 index 38e0a3050..15ce3a5b4 100644 --- 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