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.

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

[release-1.38] tag v1.38.1 #5918

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Conversation

nalind
Copy link
Member

@nalind nalind commented Jan 20, 2025

What type of PR is this?

/kind other

What this PR does / why we need it:

Tag a v1.38.1 release to incorporate the recent security update.

How to verify it

The test suite should be enough.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Changes made in locations mounted using `--mount=type=bind` in RUN instructions in `buildah build` and specified to `buildah run` are now discarded.

The changelog.txt and CHANGELOG.md files each had "vv1.37" instead of "v1.37". This corrects that.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
@nalind nalind added the No New Tests Allow PR to proceed without adding regression tests label Jan 20, 2025
@nalind
Copy link
Member Author

nalind commented Jan 20, 2025

/retitle [release-1.38] tag v1.38.1

@openshift-ci openshift-ci bot changed the title Tag v1.38.1 [release-1.38] tag v1.38.1 Jan 20, 2025
Tag a new release to incorporate the recent security advisory, and make
a minor update to the CI configuration and Makefile.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@@ -6,7 +6,7 @@ env:
#### Global variables used for all tasks
####
# Name of the ultimate destination branch for this CI run, PR or post-merge.
DEST_BRANCH: "main"
DEST_BRANCH: "release-1.38"
Copy link
Member

Choose a reason for hiding this comment

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

Oops, missed this, thanks for the correction @nalind

@@ -2,6 +2,19 @@

# Changelog

## v1.38.1 (2025-01-20)

Fix TOCTOU error when bind and cache mounts use "src" values
Copy link
Member

Choose a reason for hiding this comment

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

Any possibility to adding a [release-1.38] tag to these commits? It looks like the push just grabbed them from main.

Copy link
Member Author

Choose a reason for hiding this comment

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

They were cherry-picked for their respective branches. For release-1.38 I don't recall needing to make any changes. I'm not sure I understand the benefit of going back and retitling the commits, though...?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, the actual commits were merged, so changing their commit logs would mean rewriting the history on the branch, which means we can't do that anyway.

Copy link
Member

Choose a reason for hiding this comment

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

I just find it easier when sorting through history and the change logs to see the leading tags. YMMV, I'm OK with not adding them

Copy link
Member Author

Choose a reason for hiding this comment

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

Right now, they match the commits. It's fine.

@TomSweeneyRedHat
Copy link
Member

One tagging quesiton, otherwise LGTM.

@TomSweeneyRedHat
Copy link
Member

TomSweeneyRedHat commented Jan 20, 2025

LGTM
I'd prefer the commits to be tagged with [release-1.38], but will live if they are not.

@nalind
Copy link
Member Author

nalind commented Jan 21, 2025

LGTM I'd prefer the commits to be tagged with [release-1.38], but will live if they are not.

Changing the summaries in the commit log would require rewriting the commit history, and we're not doing that here. The changelog files reflect the commit log.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold

Copy link
Contributor

openshift-ci bot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, nalind

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the lgtm label Jan 21, 2025
@TomSweeneyRedHat
Copy link
Member

/hold cancel

@openshift-merge-bot openshift-merge-bot bot merged commit 0e6c0bc into containers:release-1.38 Jan 21, 2025
32 checks passed
@TomSweeneyRedHat
Copy link
Member

LGTM
/lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved kind/other lgtm No New Tests Allow PR to proceed without adding regression tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants