Skip to content

Conversation

@jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Oct 2, 2024

Please review a small but important fix for an issue handling EQUINOX_JAR in some build environments.

The underlying issue is that EQUINOX_JAR may or may not be required, depending on the configuration for DAISYDIFF.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • 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/apidiff.git pull/22/head:pull/22
$ git checkout pull/22

Update a local copy of the PR:
$ git checkout pull/22
$ git pull https://git.openjdk.org/apidiff.git pull/22/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/apidiff/pull/22.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2024

👋 Welcome back jjg! 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 Oct 2, 2024

@jonathan-gibbons 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:

7903856: apidiff: 7903837 breaks some builds

Reviewed-by: iris, cstein, prappo

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 changed the title CODETOOLS-7903856: apidiff: 7903837 breaks some builds 7903856: apidiff: 7903837 breaks some builds Oct 2, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 2, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 2, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2024

Webrevs

Copy link
Member

@sormuras sormuras left a comment

Choose a reason for hiding this comment

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

Works on Windows

@jonathan-gibbons
Copy link
Contributor Author

jonathan-gibbons commented Oct 2, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Oct 2, 2024

Going to push as commit db3c474.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 2, 2024
@openjdk openjdk bot closed this Oct 2, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 2, 2024
@openjdk
Copy link

openjdk bot commented Oct 2, 2024

@jonathan-gibbons Pushed as commit db3c474.

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

@jonathan-gibbons jonathan-gibbons deleted the apidiff.7903856.equinox branch October 2, 2024 14:07
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

Development

Successfully merging this pull request may close these issues.

4 participants