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

Jump to bottom

[skip-ci] Packit/RPM: Display upstream commit SHA in all rpm builds #25445

Merged
merged 1 commit into from
Mar 5, 2025
Merged

[skip-ci] Packit/RPM: Display upstream commit SHA in all rpm builds #25445

merged 1 commit into from
Mar 5, 2025

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Mar 3, 2025

Packit's pre-sync action allows modification of spec file prior to dist-git PR creation. This is already being done on containers-common rpm to update c/storage and c/image verions tags in spec.

This commit will allow podman version to show Git Commit: $SHA for all copr as well as koji builds.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added release-note-none do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 3, 2025
@packit-as-a-service Packit-as-a-Service
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@lsm5 lsm5 force-pushed the rpm-git-commit-sha branch from 2f6aa11 to 8b87f4d Compare March 3, 2025 14:08
@lsm5 lsm5 marked this pull request as ready for review March 3, 2025 14:09
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 3, 2025
@lsm5 lsm5 force-pushed the rpm-git-commit-sha branch from 8b87f4d to d2b1841 Compare March 3, 2025 14:10
@lsm5 lsm5 changed the title [skip-ci] Packit/RPM: Use GIT_COMMIT in all rpm builds [skip-ci] Packit/RPM: Display upstream commit SHA in all rpm builds Mar 3, 2025
@lsm5
Copy link
Member Author

lsm5 commented Mar 4, 2025

@containers/podman-maintainers PTAL

Luap99
Luap99 reviewed Mar 4, 2025
View reviewed changes
@lsm5 lsm5 marked this pull request as draft March 4, 2025 11:43
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 4, 2025
@lsm5
[skip-ci] Packit/RPM: Display upstream commit SHA in all rpm builds
84c5624 
Packit's `pre-sync` action allows modification of spec file prior to
dist-git PR creation. This is already being done on containers-common
rpm to update c/storage and c/image verions tags in spec.

This commit will allow `podman version` to show `Git Commit: $SHA` for
copr as well as koji builds.

Ref: https://raw.githubusercontent.com/containers/common/refs/heads/main/.packit.yaml

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5 lsm5 force-pushed the rpm-git-commit-sha branch from 2b40f43 to 84c5624 Compare March 4, 2025 12:20
@lsm5
Copy link
Member Author

lsm5 commented Mar 4, 2025

With the latest build from the PR's copr:

$ podman version
Client:        Podman Engine
Version:       5.5.0-dev
API Version:   5.5.0-dev
Go Version:    go1.24.0
Git Commit:    84c56243a2e598abf776ab49553e307054d11539
Built:         Tue Mar  4 05:30:00 2025
Build Origin:  Copr: packit/containers-podman-25445
OS/Arch:       linux/amd64

@lsm5 lsm5 marked this pull request as ready for review March 4, 2025 12:34
@mheon
Copy link
Member

mheon commented Mar 4, 2025

LGTM

Luap99
Luap99 approved these changes Mar 4, 2025
View reviewed changes
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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 4, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@lsm5
Copy link
Member Author

lsm5 commented Mar 5, 2025

/cherrypick v5.4

@openshift-cherrypick-robot
Copy link
Collaborator

@lsm5: once the present PR merges, I will cherry-pick it on top of v5.4 in a new PR and assign it to you.

In response to this:

/cherrypick v5.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@lsm5 lsm5 removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 5, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit c1e1f6d into containers:main Mar 5, 2025
42 of 43 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@lsm5: new pull request created: #25476

In response to this:

/cherrypick v5.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 5, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Luap99 Luap99 Luap99 approved these changes

Assignees

@Luap99 Luap99

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lsm5 @mheon @openshift-cherrypick-robot @Luap99