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

1061: The skara update command is broken for platforms without downloaded JDK #1174

Closed
wants to merge 1 commit into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented May 26, 2021

This patch changes the CLI launcher scripts to no longer export JAVA_HOME. This is to prevent this exported variable from interfering with the "git skara update" command. The update command needs to be able to run Gradle. Gradle cannot run with the JAVA_HOME exported from the Skara CLI scripts. Whatever JAVA_HOME the user has needs to survive through to the Gradle invocation.

I'm not sure why JAVA_HOME was set here. It seems to have been around for a long time. I'm assuming it just happened to be written that way, but if anyone can think of a reason, that would be good. I'm running with this patch myself right now to try to catch any potential problems.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1061: The skara update command is broken for platforms without downloaded JDK

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1174

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 26, 2021

👋 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-1061 1061: The skara update command is broken for platforms without downloaded JDK May 26, 2021
@openjdk openjdk bot added the rfr label May 26, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 26, 2021

Webrevs

edvbld
edvbld approved these changes May 27, 2021
Copy link
Member

@edvbld edvbld left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented May 27, 2021

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

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

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

1061: The skara update command is broken for platforms without downloaded JDK

Reviewed-by: ehelin

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 May 27, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented May 27, 2021

/integrate

@openjdk openjdk bot closed this May 27, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 27, 2021

@erikj79 Since your change was applied there has been 1 commit pushed to the master branch:

  • 2eb3dab: 1053: Github check in conclusion "stale" not handled

Your commit was automatically rebased without conflicts.

Pushed as commit b54fecb.

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