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

8210283: Support git as an SCM alternative in the build #4

Closed
wants to merge 4 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Feb 22, 2023

Backport of Git support to 11.0.0.1. Patch applies cleanly after JDK-8210008.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8210283: Support git as an SCM alternative in the build

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-ri pull/4/head:pull/4
$ git checkout pull/4

Update a local copy of the PR:
$ git checkout pull/4
$ git pull https://git.openjdk.org/jdk11u-ri pull/4/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-ri/pull/4.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 22, 2023

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into pr/3 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 changed the title Backport f29985c3212bdbb170b96fc3086a38ffcec3e367 8210283: Support git as an SCM alternative in the build Feb 22, 2023
@openjdk
Copy link

openjdk bot commented Feb 22, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Feb 22, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 22, 2023

Webrevs

Copy link
Member

@irisclark irisclark left a comment

Choose a reason for hiding this comment

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

Clean backport. Aligns with changes in jdk8u-ri for 8u42 (JSR 337 MR 4) and jdk11u{-dev}? for 11.0.4 and other releases.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/3 to master February 28, 2023 19:08
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8210283-git
git fetch https://git.openjdk.org/jdk11u-ri master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Feb 28, 2023
@openjdk
Copy link

openjdk bot commented Feb 28, 2023

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

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

8210283: Support git as an SCM alternative in the build

Reviewed-by: lancea, iris, tbell

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 master 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.

➡️ 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 Feb 28, 2023
@openjdk openjdk bot added the clean label Feb 28, 2023
@erikj79
Copy link
Member Author

erikj79 commented Feb 28, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Feb 28, 2023

Going to push as commit da9ac64.

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

openjdk bot commented Feb 28, 2023

@erikj79 Pushed as commit da9ac64.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
4 participants