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

1604: Unify behavior in gradlew and gradlew.bat #1377

Closed
wants to merge 2 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Sep 16, 2022

This patch changes the gradlew.bat script to download and extract Gradle and the JDK in the same locations as the gradlew bash script, so that running either script interchangeably works fine in the same workspace.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace

Issue

  • SKARA-1604: Unify behavior in gradlew and gradlew.bat

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/skara pull/1377/head:pull/1377
$ git checkout pull/1377

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1377

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/skara/pull/1377.diff

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 16, 2022

👋 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 changed the title SKARA-1604 1604: Unify behavior in gradlew and gradlew.bat Sep 16, 2022
@openjdk openjdk bot added the rfr label Sep 16, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 16, 2022

Webrevs

@lgxbslgx
Copy link
Member

These two scripts seems to be created automatically when creating a gradle project. Just a note.

@erikj79
Copy link
Member Author

erikj79 commented Sep 19, 2022

These two scripts seems to be created automatically when creating a gradle project. Just a note.

That's normally true in most projects built with gradle, but in Skara they are hand crafted to also pull down a suitable JDK to build with. AFAIK, there isn't much similarity at all with the scripts provided/produced by Gradle.

Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

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

LGTM.

As an aside, I think it's somewhat scary how we modify the gradlew wrapper. Conceptually, I think that should be provided by gradle, and unchanged by us.

(But changing that is outside the scope of this PR, and I do not have a ready suggestion for how to do this otherwise)

@openjdk
Copy link

openjdk bot commented Sep 20, 2022

@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.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

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

1604: Unify behavior in gradlew and gradlew.bat

Reviewed-by: 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 label Sep 20, 2022
@erikj79
Copy link
Member Author

erikj79 commented Sep 20, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 20, 2022

Going to push as commit f7103d7.
Since your change was applied there has been 1 commit pushed to the master branch:

  • c2a7adc: 1595: Introduce an IssuePoller similar to the PullRequestPoller

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Sep 20, 2022
@openjdk openjdk bot closed this Sep 20, 2022
@openjdk
Copy link

openjdk bot commented Sep 20, 2022

@erikj79 Pushed as commit f7103d7.

💡 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
Development

Successfully merging this pull request may close these issues.

None yet

3 participants