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

Recover gracefully when a PlaceholderTask is in the queue but the associated build is complete (II) #226

Merged
merged 2 commits into from
Jun 3, 2022

Conversation

jglick
Copy link
Member

@jglick jglick commented May 11, 2022

Downstream of jenkinsci/workflow-api-plugin#221. Reapplies #185 (and its amendment #188), reverting the reversion #197.

@jglick jglick requested review from dwnusbaum and car-roll May 11, 2022 19:50
@jglick jglick added the bug label May 11, 2022
Copy link
Member

@dwnusbaum dwnusbaum left a comment

Choose a reason for hiding this comment

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

Other than the version in pom.xml, this is a straight reversion of #197 with no new changes, right? Clearer IMO to use git revert or cherry-pick the old commits.

@jglick
Copy link
Member Author

jglick commented May 11, 2022

no new changes, right?

Right.

git revert

That is what I did, but needed to use --no-commit to amend the POM, and so the metadata may not have carried over.

@jglick jglick marked this pull request as ready for review June 3, 2022 14:37
@jglick jglick enabled auto-merge June 3, 2022 14:37
@jglick jglick merged commit d77b571 into jenkinsci:master Jun 3, 2022
@jglick jglick deleted the stale-placeholdertask branch June 3, 2022 15:22
@jglick
Copy link
Member Author

jglick commented Jul 11, 2022

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants