CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tag package version

This commit is contained in:
Daniel Nelson 2020-07-07 17:02:41 -07:00
parent 05537584df
commit ca19d164c4
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -24,7 +24,8 @@ else ifeq ($(tag),)
deb_iteration := 0 deb_iteration := 0
tar_version := $(version)~$(commit) tar_version := $(version)~$(commit)
else ifneq ($(findstring -rc,$(tag)),) else ifneq ($(findstring -rc,$(tag)),)
version := $(word 1,$(subst -, ,$(tag)):v%=%) version := $(word 1,$(subst -, ,$(tag)))
version := $(version:v%=%)
rc := $(word 2,$(subst -, ,$(tag))) rc := $(word 2,$(subst -, ,$(tag)))
rpm_version := $(version)-0.$(rc) rpm_version := $(version)-0.$(rc)
rpm_iteration := 0.$(subst rc,,$(rc)) rpm_iteration := 0.$(subst rc,,$(rc))

4
scripts/release.sh
View File

@ -30,7 +30,7 @@ trap on_exit EXIT
echo "${tmpdir}" echo "${tmpdir}"
cd "${tmpdir}" || exit 1 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" \ "https://circleci.com/api/v2/project/gh/influxdata/telegraf/${BUILD_NUM}/artifacts" \
-o artifacts || exit 1 -o artifacts || exit 1
@ -39,7 +39,7 @@ cat artifacts | jq -r '.items[] | "\(.url) \(.path|ltrimstr("build/dist/"))"' >
while read url path; while read url path;
do do
echo $url echo $url
curl -s -S -o "$path" "$url" && curl -s -S -L -o "$path" "$url" &&
sha256sum "$path" > "$path.DIGESTS" && sha256sum "$path" > "$path.DIGESTS" &&
gpg --armor --detach-sign "$path.DIGESTS" && gpg --armor --detach-sign "$path.DIGESTS" &&
gpg --armor --detach-sign "$path" || exit 1 gpg --armor --detach-sign "$path" || exit 1