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

Add support for offline and local builds #237

Closed
wants to merge 6 commits into from

Conversation

@edvbld
Copy link
Member

edvbld commented Nov 5, 2019

Hi all,

this patch adds much improved support for both offline and local builds. We are currently downloading both JDK and Gradle distributions for the most common platforms (GNU/Linux x64, macOS x64 and Windows x64), but this scheme does not scale to multiple other operating systems and/or CPU architectures. I have therefore extended the images plugin to support a local image which uses the JDK that is currently executing Gradle for producing the jlinked image.

I also added support for fully offline builds for those want to supply both a JDK and Gradle themselves and ensure that the build does not download anything.

Thanks,
Erik

Testing

  • Tested multiple variants of builds, including local, offline and default builds

Progress

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

Approvers

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 5, 2019

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@edvbld edvbld changed the title Added support for offline and local builds Add support for offline and local builds Nov 5, 2019
@openjdk openjdk bot added rfr cli bots build labels Nov 5, 2019
@mlbridge
Copy link

mlbridge bot commented Nov 5, 2019

@edvbld edvbld mentioned this pull request Nov 5, 2019
1 of 2 tasks complete
@edvbld
Copy link
Member Author

edvbld commented Nov 5, 2019

@nick-arm could you please try this PR out and see if it works for you? If you have JDK 12 installed locally (or at least pointed to by JAVA_HOME) then you should just be able to run sh gradlew (see the updated README for details).

@edvbld
Copy link
Member Author

edvbld commented Nov 5, 2019

@JornVernee could you give this a spin on Windows and see if it works?

Copy link
Member

rwestberg left a comment

Looks good, I think this approach sounds reasonable.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@openjdk openjdk bot removed the rfr label Nov 5, 2019
@openjdk
Copy link

openjdk bot commented Nov 5, 2019

@edvbld This change can now be integrated. The commit message will be:

Add support for offline and local builds

Co-authored-by: Nick Gasson <nick.gasson@arm.com>
Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there have been 11 commits pushed to the master branch:

  • 2cb3a2e: Use tag annotation if present when sending notifications
  • 069620b: Add buildnum extraction support for OpenJFX tags
  • e294ce9: Add ReadOnlyRepository.annotate(Tag t) method
  • b1e3d87: 151: Encode single dot characters in the SMTP client
  • f4cc08e: 148: Review comment general comment first
  • 12ced19: 149: Improve formatting of bridged emails
  • 43f8ff2: Add "Required" title to jcheck-check only if it fails
  • 0d73a1f: 147: Update the "Changes required" message
  • 0e3e711: Implement Jira authentication
  • 8c37b49: Discard duplicate checks
  • 17f2684: Support the "neutral" check conclusion

Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge master into your branch first.

  • To integrate this PR with the above commit message, type /integrate in a new comment.
@openjdk openjdk bot added the ready label Nov 5, 2019
@JornVernee
Copy link
Member

JornVernee commented Nov 5, 2019

Works for me with gradle 5.6.4 and JDK 12b33

build.gradle Show resolved Hide resolved
edvbld and others added 4 commits Nov 6, 2019
Co-Authored-By: Robin Westberg <robin@westberg.se>
Co-Authored-By: Robin Westberg <robin@westberg.se>
build.gradle Outdated Show resolved Hide resolved
build.gradle Show resolved Hide resolved
@edvbld
Copy link
Member Author

edvbld commented Nov 11, 2019

/co-author help

@openjdk
Copy link

openjdk bot commented Nov 11, 2019

@edvbld Unknown command co-author help - for a list of valid commands use /help.

@edvbld
Copy link
Member Author

edvbld commented Nov 11, 2019

/contributor add Nick Gasson nick.gasson@arm.com

@openjdk
Copy link

openjdk bot commented Nov 11, 2019

@edvbld
Contributor Nick Gasson <nick.gasson@arm.com> successfully added.

@edvbld
Copy link
Member Author

edvbld commented Nov 11, 2019

/integrate

@openjdk openjdk bot closed this Nov 11, 2019
@openjdk openjdk bot added integrated and removed ready labels Nov 11, 2019
@openjdk
Copy link

openjdk bot commented Nov 11, 2019

@edvbld The following commits have been pushed to master since your change was applied:

  • 2cb3a2e: Use tag annotation if present when sending notifications
  • 069620b: Add buildnum extraction support for OpenJFX tags
  • e294ce9: Add ReadOnlyRepository.annotate(Tag t) method
  • b1e3d87: 151: Encode single dot characters in the SMTP client
  • f4cc08e: 148: Review comment general comment first
  • 12ced19: 149: Improve formatting of bridged emails
  • 43f8ff2: Add "Required" title to jcheck-check only if it fails
  • 0d73a1f: 147: Update the "Changes required" message
  • 0e3e711: Implement Jira authentication
  • 8c37b49: Discard duplicate checks
  • 17f2684: Support the "neutral" check conclusion

Your commit was automatically rebased without conflicts.

Pushed as commit f3881b6.

@mlbridge
Copy link

mlbridge bot commented Nov 11, 2019

Mailing list message from Erik Helin on skara-dev:

Changeset: f3881b6
Author: Erik Helin
Date: 2019-11-11 07:51:16 +0000
URL: https://git.openjdk.java.net/skara/commit/f3881b62

Add support for offline and local builds

Co-authored-by: Nick Gasson <nick.gasson at arm.com>
Reviewed-by: rwestberg

! README.md
! bots/cli/build.gradle
! build.gradle
! buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/ImagesPlugin.java
! buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LaunchersTask.java
! buildSrc/images/src/main/java/org/openjdk/skara/gradle/images/LinkTask.java
! cli/build.gradle
! deps.env
! gradlew
! gradlew.bat

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.