luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix gpg_key usage, also make the location of the binary to check the version of overridable

This commit is contained in:
Matt Keeler 2018-06-18 13:42:46 -04:00
parent 0b42917150
commit 5f6f48bf63
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/functions/30-release.sh
View File

@ -219,7 +219,7 @@ function sign_release {
local hfile="${CONSUL_PKG_NAME}_${vers}_SHA256SUMS"
status_stage "==> Signing ${hfile}"
gpg_detach_sign "${1}/${hfile}" "$2" || return 1
gpg_detach_sign "${1}/${hfile}" "$3" || return 1
return 0
}

9
build-support/functions/40-publish.sh
View File

@ -70,9 +70,9 @@ function confirm_git_push_changes {
return $ret
}
function confirm_consul_version {
function confirm_consul_version_zip {
# Arguments:
# $1 - Path to the release files
# $1 - Path to the zipped binary to test
# $2 - Version to look for
#
# Returns:
@ -128,6 +128,11 @@ function confirm_consul_version {
return ${ret}
}
function confirm_consul_version {
confirm_consul_version_zip "$1" "$2"
return $?
}
function publish_release {
# Arguments: