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

8249195: Change to Xcode 11.3.1 for building on Macos at Oracle #558

Closed
wants to merge 1 commit into from

Conversation

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 25, 2021

Backport of JDK-8249195


Progress

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

Issue

  • JDK-8249195: Change to Xcode 11.3.1 for building on Macos at Oracle

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/558/head:pull/558
$ git checkout pull/558

Update a local copy of the PR:
$ git checkout pull/558
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/558/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 558

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/558.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 25, 2021

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into pr/557 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 097720cce5bc44555507fdb031c6f78134c0cfbf 8249195: Change to Xcode 11.3.1 for building on Macos at Oracle Oct 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 25, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/557 to master Oct 29, 2021
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Oct 29, 2021

The dependent pull request 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 backport-8219986
git fetch https://git.openjdk.java.net/jdk11u-dev 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 Oct 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 29, 2021

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

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

8249195: Change to Xcode 11.3.1 for building on Macos at Oracle

Reviewed-by: mdoerr

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 label Oct 29, 2021
@openjdk openjdk bot added the clean label Oct 29, 2021
@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Oct 29, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 29, 2021

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

  • 1c90fe0: 8256202: Some tweaks for jarsigner tests PosixPermissionsTest and SymLinkTest

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 29, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 29, 2021
@RealCLanger RealCLanger deleted the backport-8249195 branch Oct 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 29, 2021

@RealCLanger Pushed as commit 4a99728.

💡 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
3 participants