Skip to content

Allow unlimited patches in container image script #197

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
moroten merged 1 commit into from
Jun 17, 2026
Merged

Allow unlimited patches in container image script #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 34 additions & 7 deletions tools/update-container-image-versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,37 @@ set -eu -o pipefail
# Timestamp (Github API): 2026-03-26T15:15:18Z - parsed from https://api.github.com/repos/buildbarn/bb-storage/commits/d0c6f2633bb9e199fc7285687cdd677660dc688c
# Constructed image version: 20260326T151518Z-d0c6f26

parse_github_commit_response() {
get_override_stanza () {
local target_remote="$1"; shift

awk -v target="remote = \"$target_remote\"" '
/^git_override\(/ {
is_in_block = 1
block = $0
is_target_found = 0
next
}
is_in_block {

@stagnation stagnation Jun 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, this is new to me. Is this an implicit conditional on the variable?

similar to how END could just be a boolean,
and if would conveniently return a boolean (speculation)?

@oscar-meroton oscar-meroton Jun 16, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how END and control statements are evaluated in awk, but this is using the pattern/action syntax with an expression as the pattern.

https://www.gnu.org/software/gawk/manual/html_node/Action-Overview.html
https://www.gnu.org/software/gawk/manual/html_node/Pattern-Overview.html

# Add current line to block
block = block "\n" $0

# Check if the current line contains our target variable
if ($0 ~ target) {
is_target_found = 1
}

# Check for the closing parenthesis of the stanza
if ($0 ~ /^\)[ \t]*$/) {
is_in_block = 0
if (is_target_found) {
print block
}
}
}
' "MODULE.bazel"
}

get_timestamp_from_github_response() {
input="$1"; shift
match=$(grep -Em 1 -A4 '^ \"committer\": {' <<< "$input" \
| grep -E "^ \"date\":")
Expand All @@ -43,20 +73,17 @@ get_image_version() {
echo >&2 "Failed to fetch https://api.github.com/repos/buildbarn/$repo/commits/$hash_full"
exit 1
fi
timestamp=$(parse_github_commit_response "$commit_response")
timestamp=$(get_timestamp_from_github_response "$commit_response")
echo "$timestamp-$hash_short"
}

get_full_git_commit_hash() {
repo="$1"; shift
remote="https://github.com/buildbarn/$repo.git"

# -B6 allows for max three patches.
# TODO: Rewrite to allow for an arbitrary number
# of patches.
grep -B6 -A1 "$remote" "MODULE.bazel" \
get_override_stanza "$remote" \
| grep -E "^[[:space:]]*commit = \"" \
| grep -Eo "[0-9a-f]{40}"
| grep -E --only-matching "[0-9a-f]{40}"
}

actions_summary_page() {
Expand Down