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

8254270: linux 32 bit build doesn't compile libjdwp/log_messages.c #182

Closed
wants to merge 4 commits into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 3, 2021

This is a clean backport of JDK-8254270, another prerequisite to enable GitHub actions in 11u.


Progress

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

Issue

  • JDK-8254270: linux 32 bit build doesn't compile libjdwp/log_messages.c

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 182

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

Using diff file

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

erikj79 and others added 3 commits Aug 2, 2021
Co-authored-by: Ali Ince <ali.ince@gmail.com>
Reviewed-by: tbell
Reviewed-by: redestad, cjplummer, dholmes, stuefe
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 3, 2021

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into pr/181 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 0b7fba75c139bc263cc77c1d29f31703dd88b6f4 8254270: linux 32 bit build doesn't compile libjdwp/log_messages.c Aug 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 3, 2021

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

@openjdk openjdk bot added backport clean rfr labels Aug 3, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 3, 2021

Webrevs

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Aug 4, 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 8221988
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 Aug 4, 2021
@openjdk openjdk bot added the clean label Aug 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2021

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

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

8254270: linux 32 bit build doesn't compile libjdwp/log_messages.c

Reviewed-by: stuefe

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 Aug 4, 2021
tstuefe
tstuefe approved these changes Aug 5, 2021
Copy link
Member

@tstuefe tstuefe left a comment

LGTM

@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Aug 5, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 5, 2021

Going to push as commit 1c77fa8.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 52a32a7: 8269851: OperatingSystemMXBean getProcessCpuLoad reports incorrect process cpu usage in containers
  • 1223b58: 8212040: Compilation error due to wrong usage of NSPrintJobDispositionValue in mac10.12
  • b878e3f: 8263432: javac may report an invalid package/class clash on case insensitive filesystems

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 5, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 5, 2021

@RealCLanger Pushed as commit 1c77fa8.

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

@RealCLanger RealCLanger deleted the 8254270 branch Aug 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
4 participants