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

[v4.4] make hack/markdown-preprocess parallel-safe #17360

Merged
merged 1 commit into from
Feb 6, 2023
Merged

[v4.4] make hack/markdown-preprocess parallel-safe #17360

merged 1 commit into from
Feb 6, 2023

Conversation

openshift-cherrypick-robot
Copy link
Collaborator

This is an automated cherry-pick of #17331

/assign vrothberg

Fixes a bug in which parallel `make docs` crashed

@edsantiago
make hack/markdown-preprocess parallel-safe
c2971a6 
One of the tmpfiles was not uniquely named, resulting in
conflicts with parallel 'make docs'. Fix that.

A better solution would be to run only one instance of the
preprocess script, but the Makefile incantation for that
is beyond me. This approach is CPU-wasteful but good enough.

Fixes: containers#17322

Signed-off-by: Ed Santiago <santiago@redhat.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 3, 2023
Merged
@rhatdan
Copy link
Member

rhatdan commented Feb 3, 2023

/approve
/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 3, 2023
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 3, 2023
vrothberg
vrothberg approved these changes Feb 6, 2023
View reviewed changes
Copy link
Member

@vrothberg vrothberg 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 cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 6, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, rhatdan, vrothberg

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-robot openshift-merge-robot merged commit 56856b0 into containers:v4.4 Feb 6, 2023
This was referenced Feb 6, 2023
Closed
Open
Closed
@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 Sep 11, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vrothberg vrothberg vrothberg approved these changes

Assignees

@rhatdan rhatdan

@vrothberg vrothberg

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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@openshift-cherrypick-robot @rhatdan @vrothberg @openshift-merge-robot @edsantiago