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

CODETOOLS-7902987: Git build should record the actual tag, not the latest one #14

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 28, 2021

Use git describe to poll the actual tag. Otherwise JTReg build would always report the latest tag (currently jtreg6), regardless of the actually built version. See more details in the bug report.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Referenced JBS issue must only be used for a single change
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jtreg pull/14/head:pull/14
$ git checkout pull/14

Update a local copy of the PR:
$ git checkout pull/14
$ git pull https://git.openjdk.java.net/jtreg pull/14/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jtreg/pull/14.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 28, 2021

👋 Welcome back shade! 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
Copy link

openjdk bot commented Jun 28, 2021

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

7902987: Git build should record the actual tag, not the latest one

Reviewed-by: jjg

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 88 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 28, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 28, 2021

Webrevs

Copy link
Collaborator

@jonathan-gibbons jonathan-gibbons left a comment

Looks OK, but note that make/build-all.sh will soon be deleted; use make/build.sh instead.

@shipilev
Copy link
Member Author

shipilev commented Jul 8, 2021

Yes, noted. Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Jul 8, 2021

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 8, 2021
@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 Jul 8, 2021
@openjdk
Copy link

openjdk bot commented Jul 8, 2021

@shipilev Pushed as commit ace6d33.

💡 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
integrated Pull request has been integrated
2 participants