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

8288499: Restore cancel-in-progress in GHA #9170

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Jun 15, 2022

I accidentally changed the behavior in GHA wrt multiple runs from the same branch. The old solution used cancel-in-progress: true which means that an old batch was cancelled when a new commit was pushed to the branch.

I think this is a good behavior, since it minimizes wait times for GHA results, and wastes less GHA resources.

I changed this to false while developing the new GHA framework, and intended to change it back before pushing, but forgot about it.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9170/head:pull/9170
$ git checkout pull/9170

Update a local copy of the PR:
$ git checkout pull/9170
$ git pull https://git.openjdk.org/jdk pull/9170/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9170

View PR using the GUI difftool:
$ git pr show -t 9170

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9170.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2022

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 15, 2022
@openjdk
Copy link

openjdk bot commented Jun 15, 2022

@magicus The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Jun 15, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 15, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 15, 2022

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8288499: Restore cancel-in-progress in GHA

Reviewed-by: erikj, shade

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 13d4ddc: 8286962: java/net/httpclient/ServerCloseTest.java failed once with ConnectException

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 15, 2022
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Whoops. Looks good.

@magicus
Copy link
Member Author

magicus commented Jun 15, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 15, 2022

Going to push as commit cb5ef3d.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 13d4ddc: 8286962: java/net/httpclient/ServerCloseTest.java failed once with ConnectException

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 15, 2022
@openjdk openjdk bot closed this Jun 15, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 15, 2022
@openjdk
Copy link

openjdk bot commented Jun 15, 2022

@magicus Pushed as commit cb5ef3d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the restore-cancel-in-progress branch October 18, 2022 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
3 participants