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

JDK-8257789: Fix incremental build of test-image and bundles #1635

Closed
wants to merge 3 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Dec 4, 2020

When building the test-bundle incrementally, it always gets rebuilt. This is caused by the prepare-test-image target in TestImage.gmk, where we create a README file as part of a recipe for a PHONY target. This means that the README is always rebuilt, which in turn triggers downstream rebuilds. This is generally a bad pattern that should be avoided.


Progress

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

Issue

  • JDK-8257789: Fix incremental build of test-image and bundles

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1635/head:pull/1635
$ git checkout pull/1635

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 4, 2020

👋 Welcome back erikj! 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 added the rfr Pull request is ready for review label Dec 4, 2020
@openjdk
Copy link

openjdk bot commented Dec 4, 2020

@erikj79 The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Dec 4, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 4, 2020

Webrevs

Copy link
Member

@tbell29552 tbell29552 left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Dec 7, 2020

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

8257789: Fix incremental build of test-image and bundles

Reviewed-by: tbell, ihse

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 Dec 7, 2020
@openjdk
Copy link

openjdk bot commented Dec 8, 2020

@erikj79 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 JDK-8257789-test-image-incr
git fetch https://git.openjdk.java.net/jdk 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 merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Dec 8, 2020
@erikj79
Copy link
Member Author

erikj79 commented Dec 8, 2020

/integrate

@openjdk
Copy link

openjdk bot commented Dec 8, 2020

@erikj79 This PR has not yet been marked as ready for integration.

@erikj79
Copy link
Member Author

erikj79 commented Dec 8, 2020

/integrate

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 8, 2020
@openjdk openjdk bot closed this Dec 8, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 8, 2020
@openjdk
Copy link

openjdk bot commented Dec 8, 2020

@erikj79 The command integrate can only be used in open pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
3 participants