Skip to content

fix(release): Make scripts exit on failure #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickLarsenNZ merged 3 commits into from
Jun 2, 2025
Merged

fix(release): Make scripts exit on failure #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09337f3
fix(release): Make scripts exit on failure
NickLarsenNZ May 2, 2025
9a5c903
chore(release): Handle failing commands gracefully in strict mode
NickLarsenNZ May 28, 2025
857c776
chore(nix): Add pyyaml dependency to pass the pre-req checks in relea…
NickLarsenNZ May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions release/create-release-candidate-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ check_tag_is_valid() {
git fetch --tags

# check tags: N.B. look for exact match
TAG_EXISTS=$(git tag --list | grep -E "$RELEASE_TAG$")
if [ -n "$TAG_EXISTS" ]; then
if git tag --list | grep -E "^$RELEASE_TAG\$"; then
>&2 echo "Tag $RELEASE_TAG already exists!"
exit 1
fi
Expand Down Expand Up @@ -100,17 +99,18 @@ check_products() {

# switch to the release branch, which should exist as tagging
# is subsequent to creating the branch.
BRANCH_EXISTS=$(git branch -a | grep -E "$RELEASE_BRANCH$")

if [ -z "${BRANCH_EXISTS}" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$RELEASE_BRANCH\$"
if ! git branch -a | grep -E "$RELEASE_BRANCH\$"; then
>&2 echo "Expected release branch is missing: $RELEASE_BRANCH"
exit 1
fi

# the new PR should not exist, otherwise a duplicate commit
# will be prepared
BRANCH_EXISTS=$(git branch -a | grep -E "$PR_BRANCH$")
if [ -n "${BRANCH_EXISTS}" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$PR_BRANCH\$"
if git branch -a | grep -E "$PR_BRANCH\$"; then
>&2 echo "PR branch already exists: ${REMOTE}/$PR_BRANCH"
exit 1
fi
Expand All @@ -137,16 +137,18 @@ check_operators() {

fi
cd "$TEMP_RELEASE_FOLDER/${operator}"
BRANCH_EXISTS=$(git branch -a | grep -E "$RELEASE_BRANCH$")
if [ -z "${BRANCH_EXISTS}" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$RELEASE_BRANCH\$"
if ! git branch -a | grep -E "$RELEASE_BRANCH\$"; then
>&2 echo "Expected release branch is missing: ${operator}/$RELEASE_BRANCH"
exit 1
fi

# the new PR should not exist, otherwise a duplicate commit
# will be prepared
BRANCH_EXISTS=$(git branch -a | grep -E "$PR_BRANCH$")
if [ -n "${BRANCH_EXISTS}" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$PR_BRANCH\$"
if git branch -a | grep -E "$PR_BRANCH\$"; then
>&2 echo "PR branch already exists: ${operator}/$PR_BRANCH"
exit 1
fi
Expand Down Expand Up @@ -292,14 +294,12 @@ parse_inputs() {

check_dependencies() {
# check for a globally configured git user
git_user=$(git config --global --includes --get user.name)
git_email=$(git config --global --includes --get user.email)
echo "global git user: $git_user <$git_email>"

if [ -z "$git_user" ] || [ -z "$git_email" ]; then
if ! git_user=$(git config --global --includes --get user.name) \
|| ! git_email=$(git config --global --includes --get user.email); then
>&2 echo "Error: global git user name/email is not set."
exit 1
else
echo "global git user: $git_user <$git_email>"
echo "Is this correct? (y/n)"
read -r response
if [[ "$response" == "y" || "$response" == "Y" ]]; then
Expand Down Expand Up @@ -344,10 +344,7 @@ main() {
check_dependencies

# sanity checks before we start: folder, branches etc.
# deactivate -e so that piped commands can be used
set +e
Comment thread
NickLarsenNZ marked this conversation as resolved.
checks
set -e

echo "Cloning docker-images and/or operators to [$TEMP_RELEASE_FOLDER]"
rc_branch_repos
Expand Down
8 changes: 3 additions & 5 deletions release/merge-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,12 @@ merge() {

check_dependencies() {
# check for a globally configured git user
git_user=$(git config --global --includes --get user.name)
git_email=$(git config --global --includes --get user.email)
echo "global git user: $git_user <$git_email>"

if [ -z "$git_user" ] || [ -z "$git_email" ]; then
if ! git_user=$(git config --global --includes --get user.name) \
|| ! git_email=$(git config --global --includes --get user.email); then
>&2 echo "Error: global git user name/email is not set."
exit 1
else
echo "global git user: $git_user <$git_email>"
echo "Is this correct? (y/n)"
read -r response
if [[ "$response" == "y" || "$response" == "Y" ]]; then
Expand Down
23 changes: 9 additions & 14 deletions release/post-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ check_operators() {
exit 2
fi

BRANCH_EXISTS=$(git branch -a | grep "$RELEASE_BRANCH")
if [ -z "$BRANCH_EXISTS" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$RELEASE_BRANCH\$"
if ! git branch -a | grep "$RELEASE_BRANCH\$"; then
>&2 echo "Expected release branch is missing: $OPERATOR/$RELEASE_BRANCH"
exit 1
fi
git fetch --tags
TAG_EXISTS=$(git tag | grep "$RELEASE_TAG")
if [ -z "$TAG_EXISTS" ]; then
if ! git tag | grep "^$RELEASE_TAG\$"; then
>&2 echo "Expected tag $RELEASE_TAG missing for operator $OPERATOR"
exit 1
fi
Expand Down Expand Up @@ -127,15 +127,16 @@ check_products() {
exit 2
fi

BRANCH_EXISTS=$(git branch -a | grep "$RELEASE_BRANCH")
if [ -z "${BRANCH_EXISTS}" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$RELEASE_BRANCH\$"
if ! git branch -a | grep "$RELEASE_BRANCH\$"; then
>&2 echo "Expected release branch is missing: $DOCKER_IMAGES_REPO/$RELEASE_BRANCH"
exit 1
fi

git fetch --tags
TAG_EXISTS=$(git tag | grep "$RELEASE_TAG")
if [ -z "${TAG_EXISTS}" ]; then
# check tags: N.B. look for exact match
if ! git tag | grep "^$RELEASE_TAG\$"; then
>&2 echo "Expected tag $RELEASE_TAG missing for $DOCKER_IMAGES_REPO"
exit 1
fi
Expand Down Expand Up @@ -199,20 +200,14 @@ main() {

if [ "products" == "$WHAT" ] || [ "all" == "$WHAT" ]; then
# sanity checks before we start: folder, branches etc.
# deactivate -e so that piped commands can be used
set +e
check_products
set -e

echo "Update $DOCKER_IMAGES_REPO main changelog for release $RELEASE_TAG"
update_products
fi
if [ "operators" == "$WHAT" ] || [ "all" == "$WHAT" ]; then
# sanity checks before we start: folder, branches etc.
# deactivate -e so that piped commands can be used
set +e
check_operators
set -e

echo "Update the operator main changelog for release $RELEASE_TAG"
update_operators
Expand Down
19 changes: 7 additions & 12 deletions release/tag-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ check_tag_is_valid() {
git fetch --tags

# check tags: N.B. look for exact match
TAG_EXISTS=$(git tag --list | grep -E "$RELEASE_TAG$")
if [ -n "$TAG_EXISTS" ]; then
if git tag --list | grep -E "^$RELEASE_TAG\$"; then
>&2 echo "Tag $RELEASE_TAG already exists!"
exit 1
fi
Expand Down Expand Up @@ -81,8 +80,9 @@ check_operators() {

fi
cd "$TEMP_RELEASE_FOLDER/${operator}"
BRANCH_EXISTS=$(git branch -a | grep -E "$RELEASE_BRANCH$")
if [ -z "${BRANCH_EXISTS}" ]; then
# Note, if this needs to check the branch exists locally, then use:
# "^[ *]*$RELEASE_BRANCH\$"
if ! git branch -a | grep -E "$RELEASE_BRANCH\$"; then
>&2 echo "Expected release branch is missing: ${operator}/$RELEASE_BRANCH"
exit 1
fi
Expand Down Expand Up @@ -158,14 +158,12 @@ parse_inputs() {

check_dependencies() {
# check for a globally configured git user
git_user=$(git config --global --includes --get user.name)
git_email=$(git config --global --includes --get user.email)
echo "global git user: $git_user <$git_email>"

if [ -z "$git_user" ] || [ -z "$git_email" ]; then
if ! git_user=$(git config --global --includes --get user.name) \
|| ! git_email=$(git config --global --includes --get user.email); then
>&2 echo "Error: global git user name/email is not set."
exit 1
else
echo "global git user: $git_user <$git_email>"
echo "Is this correct? (y/n)"
read -r response
if [[ "$response" == "y" || "$response" == "Y" ]]; then
Expand Down Expand Up @@ -210,10 +208,7 @@ main() {
check_dependencies

# sanity checks before we start: folder, branches etc.
# deactivate -e so that piped commands can be used
set +e
checks
set -e

tag_repos
cleanup
Expand Down
5 changes: 4 additions & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ pkgs ? import <nixpkgs> { } }:
{
pkgs ? import <nixpkgs> { },
}:
pkgs.mkShell {
nativeBuildInputs = with pkgs; [
cargo-edit
Expand All @@ -7,5 +9,6 @@ pkgs.mkShell {
jinja2-cli
yq-go
python311Packages.pip
python311Packages.pyyaml
];
}