Fix tag package version
This commit is contained in:
parent
05537584df
commit
ca19d164c4
3
Makefile
3
Makefile
|
|
@ -24,7 +24,8 @@ else ifeq ($(tag),)
|
|||
deb_iteration := 0
|
||||
tar_version := $(version)~$(commit)
|
||||
else ifneq ($(findstring -rc,$(tag)),)
|
||||
version := $(word 1,$(subst -, ,$(tag)):v%=%)
|
||||
version := $(word 1,$(subst -, ,$(tag)))
|
||||
version := $(version:v%=%)
|
||||
rc := $(word 2,$(subst -, ,$(tag)))
|
||||
rpm_version := $(version)-0.$(rc)
|
||||
rpm_iteration := 0.$(subst rc,,$(rc))
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ trap on_exit EXIT
|
|||
echo "${tmpdir}"
|
||||
cd "${tmpdir}" || exit 1
|
||||
|
||||
curl -s -S -H Circle-Token:${CIRCLE_TOKEN} \
|
||||
curl -s -S -L -H Circle-Token:${CIRCLE_TOKEN} \
|
||||
"https://circleci.com/api/v2/project/gh/influxdata/telegraf/${BUILD_NUM}/artifacts" \
|
||||
-o artifacts || exit 1
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ cat artifacts | jq -r '.items[] | "\(.url) \(.path|ltrimstr("build/dist/"))"' >
|
|||
while read url path;
|
||||
do
|
||||
echo $url
|
||||
curl -s -S -o "$path" "$url" &&
|
||||
curl -s -S -L -o "$path" "$url" &&
|
||||
sha256sum "$path" > "$path.DIGESTS" &&
|
||||
gpg --armor --detach-sign "$path.DIGESTS" &&
|
||||
gpg --armor --detach-sign "$path" || exit 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue