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

Consolidate XDG_RUNTIME code #20528

Merged

Conversation

giuseppe
Copy link
Member

test for: containers/storage#1740

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 30, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from f2ee640 to c84727d Compare October 30, 2023 09:46
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2023
@packit-as-a-service
Copy link

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

@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from c84727d to d5f2e1e Compare October 30, 2023 09:50
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch 10 times, most recently from b023d15 to 6908f8d Compare October 31, 2023 22:09
@Luap99
Copy link
Member

Luap99 commented Nov 1, 2023

juts dropping this comment here that there is another runtime dir function in c/common: https://github.com/containers/common/blob/116177bb4c79804720002cb2402151a6cb005cc7/pkg/util/util_supported.go#L31

That should be replaced and tested as well, I tried in the past and it failed and got reverted: #13391. Of course as usual with no explaining as of why.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 1, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch 2 times, most recently from c171cbd to 5741726 Compare November 2, 2023 08:51
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 2, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch 2 times, most recently from f005d28 to 61dfac4 Compare November 2, 2023 09:49
@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Nov 2, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from 61dfac4 to 587062b Compare November 3, 2023 08:47
@github-actions github-actions bot removed the kind/api-change Change to remote API; merits scrutiny label Nov 3, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from 587062b to 73b38e1 Compare November 3, 2023 09:58
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch 7 times, most recently from 290a6c8 to 0c495e6 Compare November 15, 2023 21:04
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from 0c495e6 to 3383313 Compare November 15, 2023 21:15
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from 3383313 to b7bb3cc Compare November 16, 2023 07:40
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2023
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from b7bb3cc to ffd1992 Compare November 21, 2023 20:05
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2023
@giuseppe giuseppe changed the title [WIP][DO NOT MERGE] Consolidate XDG_RUNTIME code Consolidate XDG_RUNTIME code Nov 21, 2023
@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 Nov 21, 2023
@giuseppe
Copy link
Member Author

ready to merge!

@rhatdan
Copy link
Member

rhatdan commented Nov 23, 2023

LGTM

@giuseppe
Copy link
Member Author

@flouthoc PTAL

@@ -1,6 +1,6 @@
# /tmp/podman-run-* directory can contain content for Podman containers that have run
# for many days. This following line prevents systemd from removing this content.
x /tmp/podman-run-*
Copy link
Member

Choose a reason for hiding this comment

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

given podman stores the old tmpdir in the db and will keep using it AFAICT we should keep that old entry as well

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

[NO NEW TESTS NEEDED] no new functionalities are added

Signed-off-by: Giuseppe Scrivano <[email protected]>
@giuseppe giuseppe force-pushed the consolidate-xdg-runtime-code branch from ffd1992 to cd21973 Compare November 23, 2023 20:36
Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM
/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2023
Copy link
Contributor

openshift-ci bot commented Nov 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, giuseppe

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-merge-bot openshift-merge-bot bot merged commit 6c29a87 into containers:main Nov 24, 2023
93 checks passed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Feb 23, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants