mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Release scripts: Minor fixes discovered during attempt for 3.5.0-alpha.0
This commit is contained in:
parent
db8c8c4246
commit
c640957e2d
@ -68,7 +68,8 @@ function update_versions_cmd() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function get_gpg_key {
|
function get_gpg_key {
|
||||||
keyid=$(gpg --list-keys --with-colons| awk -F: '/^pub:/ { print $5 }')
|
gitemail=$(git config --get user.email)
|
||||||
|
keyid=$(run gpg --list-keys --with-colons "${gitemail}" | awk -F: '/^pub:/ { print $5 }')
|
||||||
if [[ -z "${keyid}" ]]; then
|
if [[ -z "${keyid}" ]]; then
|
||||||
log_error "Failed to load gpg key. Is gpg set up correctly for etcd releases?"
|
log_error "Failed to load gpg key. Is gpg set up correctly for etcd releases?"
|
||||||
return 2
|
return 2
|
||||||
|
@ -201,7 +201,7 @@ function modules_exp() {
|
|||||||
# (unless the set is limited using ${PKG} or / ${USERMOD})
|
# (unless the set is limited using ${PKG} or / ${USERMOD})
|
||||||
function run_for_modules {
|
function run_for_modules {
|
||||||
local pkg="${PKG:-./...}"
|
local pkg="${PKG:-./...}"
|
||||||
if [ -z "${USERMOD}" ]; then
|
if [ -z "${USERMOD:-}" ]; then
|
||||||
for m in $(module_dirs); do
|
for m in $(module_dirs); do
|
||||||
run_for_module "${m}" "$@" "${pkg}" || return "$?"
|
run_for_module "${m}" "$@" "${pkg}" || return "$?"
|
||||||
done
|
done
|
||||||
@ -355,7 +355,9 @@ function assert_no_git_modifications {
|
|||||||
# - no differencing commits in relation to the origin/$branch
|
# - no differencing commits in relation to the origin/$branch
|
||||||
function git_assert_branch_in_sync {
|
function git_assert_branch_in_sync {
|
||||||
local branch
|
local branch
|
||||||
branch=$(git branch --show-current)
|
branch=$(run git rev-parse --abbrev-ref HEAD)
|
||||||
|
# TODO: When git 2.22 popular, change to:
|
||||||
|
# branch=$(git branch --show-current)
|
||||||
if [[ $(run git status --porcelain --untracked-files=no) ]]; then
|
if [[ $(run git status --porcelain --untracked-files=no) ]]; then
|
||||||
log_error "The workspace in '$(pwd)' for branch: ${branch} has uncommitted changes"
|
log_error "The workspace in '$(pwd)' for branch: ${branch} has uncommitted changes"
|
||||||
log_error "Consider cleaning up / renaming this directory or (cd $(pwd) && git reset --hard)"
|
log_error "Consider cleaning up / renaming this directory or (cd $(pwd) && git reset --hard)"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user