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

8242468: VS2019 build missing vcruntime140_1.dll #1247

Closed
wants to merge 3 commits into from

Conversation

gdams
Copy link
Member

@gdams gdams commented Jul 20, 2022

Fixes an issue observed at Adoptium when bumping the compiler to VS 2019 (adoptium/temurin-build#3052)


Progress

  • 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/jdk11u-dev pull/1247/head:pull/1247
$ git checkout pull/1247

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1247

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 20, 2022

👋 Welcome back gdams! 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 changed the title Backport 165fa2450c1a7550d723be4c62bf54de464798bb 8242468: VS2019 build missing vcruntime140_1.dll Jul 20, 2022
@openjdk
Copy link

openjdk bot commented Jul 20, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 20, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 20, 2022

Webrevs

Copy link
Contributor

@RealCLanger RealCLanger left a comment

LGTM

@openjdk
Copy link

openjdk bot commented Jul 20, 2022

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

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

8242468: VS2019 build missing vcruntime140_1.dll

Reviewed-by: clanger

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealCLanger) but any other Committer may sponsor as well.

➡️ 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 openjdk bot added the ready Pull request is ready to be integrated label Jul 20, 2022
@RealCLanger
Copy link
Contributor

RealCLanger commented Jul 28, 2022

Hm, as you are backporting 8239708 in #1277, I think you should do this backport afterwards. It'll then probably apply cleanly. As of now it looks as if you'd have forgotten this change in basics.m4 in #1277

@gdams gdams changed the base branch from master to pr/1277 Aug 24, 2022
@gdams
Copy link
Member Author

gdams commented Aug 24, 2022

Hm, as you are backporting 8239708 in #1277, I think you should do this backport afterwards. It'll then probably apply cleanly. As of now it looks as if you'd have forgotten this change in basics.m4 in #1277

I've switched the base now so this should be good

@openjdk openjdk bot added the clean label Aug 24, 2022
@openjdk-notifier
Copy link

openjdk-notifier bot commented Aug 24, 2022

@gdams Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Aug 24, 2022
@gdams gdams changed the base branch from pr/1277 to master Sep 2, 2022
@openjdk openjdk bot removed the clean label Sep 2, 2022
@openjdk
Copy link

openjdk bot commented Sep 2, 2022

@gdams this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout vcruntime
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 2, 2022
@openjdk openjdk bot added clean ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Sep 2, 2022
@gdams
Copy link
Member Author

gdams commented Sep 2, 2022

/integrate

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

openjdk bot commented Sep 2, 2022

@gdams
Your change (at version bc27419) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

RealCLanger commented Sep 2, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 2, 2022

Going to push as commit 2548ed3.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 2, 2022
@openjdk openjdk bot closed this Sep 2, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Sep 2, 2022
@gdams gdams deleted the vcruntime branch Sep 2, 2022
@openjdk openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Sep 2, 2022
@openjdk
Copy link

openjdk bot commented Sep 2, 2022

@RealCLanger @gdams Pushed as commit 2548ed3.

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