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

7903206: Support MSYS2 for building jtreg on Windows #88

Closed
wants to merge 1 commit into from

Conversation

sormuras
Copy link
Member

@sormuras sormuras commented Jun 9, 2022

Reviewed-by: ihse, jjg

(cherry picked from commit d60381d)


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (no review required)

Issue

  • CODETOOLS-7903206: Support MSYS2 for building jtreg on Windows ⚠️ Issue is not open.

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 88

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jtreg/pull/88.diff

Reviewed-by: ihse, jjg

(cherry picked from commit d60381d)
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 9, 2022

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

@openjdk
Copy link

openjdk bot commented Jun 9, 2022

@sormuras 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:

7903206: Support MSYS2 for building jtreg on Windows

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 no new commits pushed to the branch-6.1+x branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk
Copy link

openjdk bot commented Jun 9, 2022

⚠️ @sormuras a branch with the same name as the source branch for this pull request (branch-6.1+x) is present in the target repository. If you eventually integrate this pull request then the branch branch-6.1+x in your personal fork will diverge once you sync your personal fork with the upstream repository.

To avoid this situation, create a new branch for your changes and reset the branch-6.1+x branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME.

$ git checkout -b NEW-BRANCH-NAME
$ git branch -f branch-6.1+x 4d06ab3158fc61a34c3b897fa68bab14dca7a438
$ git push -f origin branch-6.1+x

Then proceed to create a new pull request with NEW-BRANCH-NAME as the source branch and close this one.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2022
@sormuras sormuras marked this pull request as ready for review June 9, 2022 18:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 9, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 9, 2022

Webrevs

@jonathan-gibbons
Copy link
Collaborator

You may need to file a back port request, since the original issue (to update 7) has now been closed. There are also some warnings from the bots that you should check.

@sormuras
Copy link
Member Author

As Skara doesn't manage versions of jtreg (it lacks a version configured in .jcheck/conf) a back port request seems not required.

The warning only addresses a naming conflict detected for my personal fork - which I tend to ignore, as I won't sync that branch in the future.

In the light of that, I will issue a /integrate command in a follow-up comment.

@sormuras
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 10, 2022
@openjdk
Copy link

openjdk bot commented Jun 10, 2022

@sormuras
Your change (at version 0b10dbf) is now ready to be sponsored by a Committer.

@jonathan-gibbons
Copy link
Collaborator

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 10, 2022

Going to push as commit 382fe54.

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

openjdk bot commented Jun 10, 2022

@jonathan-gibbons @sormuras Pushed as commit 382fe54.

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

@jonathan-gibbons
Copy link
Collaborator

Going forward, I think it would be better to lean into Skara some more, and configure a version in .jcheck/conf

@sormuras sormuras deleted the branch-6.1+x branch June 10, 2022 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants