Skip to content
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

chore: Fix build-image after introducing merge queue #1676

Merged
merged 1 commit into from
Dec 13, 2024
Merged

chore: Fix build-image after introducing merge queue #1676

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion .github/workflows/build-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
if [[ $GITHUB_EVENT_NAME == 'push' ]]; then
echo 'TAGS=${{ github.ref_name }}' >> "$GITHUB_OUTPUT"
elif [[ $GITHUB_EVENT_NAME == 'merge_group' ]]; then
{
echo 'TAGS=${{ github.event.merge_group.head_sha }}' >> "$GITHUB_OUTPUT"
else
{
Expand Down
2 changes: 1 addition & 1 deletion hack/await_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ START_TIME=$SECONDS

until $(skopeo list-tags ${PROTOCOL}${IMAGE_REPO} | jq '.Tags|any(. == env.TRIGGER)'); do
if (( SECONDS - START_TIME > TIMEOUT )); then
echo "Timeout reached: ${IMAGE_REPO}:${COMMIT_SHA} not found within $(( TIMEOUT/60 )) minutes"
echo "Timeout reached: ${IMAGE_REPO}:${TRIGGER} not found within $(( TIMEOUT/60 )) minutes"
exit 1
fi
echo "Waiting for binary image: ${IMAGE_REPO}:${TRIGGER}"
Expand Down
Loading