Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

[#85, #86] Use OpenJDK for CI, use "gradle all test" instead of "gradle build". #88

Merged
merged 2 commits into from
Jun 5, 2018

Conversation

brcolow
Copy link
Contributor

@brcolow brcolow commented May 24, 2018

Fixes #86 and #85

@brcolow brcolow force-pushed the openjdk-10 branch 2 times, most recently from 50650a5 to d2b05e3 Compare May 24, 2018 23:20
@brcolow
Copy link
Contributor Author

brcolow commented May 25, 2018

I am trying to use the AdoptOpenJDK brew tap to install OpenJDK on macOS but running into this error:

==> Tapping adoptopenjdk/openjdk
Cloning into '/usr/local/Homebrew/Library/Taps/adoptopenjdk/homebrew-openjdk'...
remote: Counting objects: 7, done.        
remote: Compressing objects: 100% (7/7), done.        
remote: Total 7 (delta 2), reused 0 (delta 0), pack-reused 0        
Unpacking objects: 100% (7/7), done.
Tapped 3 formulae (33 files, 25.5KB)
==> Installing adoptopenjdk-openjdk10 from adoptopenjdk/openjdk
==> Downloading https://github.com/AdoptOpenJDK/openjdk10-releases/releases/download/jdk-10%2B23/OpenJDK10_x64_Mac_jdk-10.23.tar.gz
curl: (22) The requested URL returned error: 404 Not Found
Error: Failed to download resource "adoptopenjdk-openjdk10"
Download failed: https://github.com/AdoptOpenJDK/openjdk10-releases/releases/download/jdk-10%2B23/OpenJDK10_x64_Mac_jdk-10.23.tar.gz
The command ".ci/before_install.sh" failed and exited with 1 during .

@brcolow
Copy link
Contributor Author

brcolow commented May 25, 2018

Seems to be caused by adoptium/temurin-build#317. There are no "releases" for Java 10 anymore. I can try and use some shell scripting to manually download and install OpenJDK on macOS.

@brcolow brcolow force-pushed the openjdk-10 branch 6 times, most recently from 08ad89c to 76a9121 Compare May 26, 2018 09:35
@brcolow brcolow changed the title [WIP] Use OpenJDK instead of Oracle JDK for CI. Use OpenJDK instead of Oracle JDK for CI. May 26, 2018
@brcolow brcolow changed the title Use OpenJDK instead of Oracle JDK for CI. [#85, #86] Use OpenJDK for CI, use "gradle all test" instead of "gradle build". May 26, 2018
@eugener eugener added the enhancement New feature or request label May 27, 2018
@johanvos
Copy link
Collaborator

This should target the master branch instead of develop, as it is not intented to go upstream to OpenJFX, correct?

@brcolow
Copy link
Contributor Author

brcolow commented May 28, 2018

Correct.

Copy link
Collaborator

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

The changes look fine to me, and the log files show that the 'all' task was successful on all platforms. Can you retarget this to the master branch?

@brcolow brcolow changed the base branch from develop to master June 5, 2018 08:32
@brcolow
Copy link
Contributor Author

brcolow commented Jun 5, 2018

Changed the base branch to master.

@kevinrushforth kevinrushforth merged commit 39247d7 into javafxports:master Jun 5, 2018
scientificware added a commit to scientificware/openjdk-jfx that referenced this pull request Jun 13, 2018
* Set the locale of the javadoc

Setting the locale to a fixed value when generating the javadoc ensures the output of the build doesn't depend on developer specific settings. This improves the reproducibility of the build.

* Fix PosixPlatform.cpp compilation with GCC 6

* Create CONTRIBUTING.md

* Fix launcher library compilation with GCC 6

* fix NPE in getMediaName()

* 8199841: Add gradle wrapper files to build
Reviewed-by: jvos
Contributed-by: [email protected]

* Add Gradle wrapper files

* Update ci scripts to use gradlew

* Gradle build failure should show informative message

* 8195799: Use System logger instead of platform logger in javafx modules
Reviewed-by: kcr, mchung, dfuchs, jvos

* Added tag jdk-11+7 for changeset 0cd88e183e61

* 8088769: Alphachannel for transparent colors is not shown in HtmlEditor
Reviewed-by: kcr, mbilla

* 8200277: Compiling native media code fails when using OpenJDK build as boot JDK

* Qt-dev tools are no longer needed by OpenJFX (javafxports#48)

* Additional updates needed for JDK-8199841 to add gradle wrapper files to build (javafxports#49)

1. Added the gradle.md license file
2. Replaced gradle-wrapper.jar with one generated from gradle 4.3 to match the version in the license file (we shouldn't need to update this again after this)
With the above changes, there should be no merge conflicts when JDK-8199841 is integrated to the upstream openjfx/jfx-dev repo.

* 8200277: Compiling native media code fails when using OpenJDK build as boot JDK
Reviewed-by: jvos, prr

* Added tag jdk-11+8 for changeset b956f9ea2553

* add script used by jenkins job to sync with openjfx mercurial repository

* 8193311: [Spinner] Default button not activated on ENTER
Reviewed-by: kcr, aghaisas

* Use JDK 10 on Travis CI and Appveyor. (javafxports#63)

* Created a basic .gitignore file (javafxports#60)

* Update ci scripts to use gradlew

* Qt-dev tools are no longer needed by OpenJFX (javafxports#48)

* Use JDK 10 on Travis CI and Appveyor. (javafxports#63)

* Created a basic .gitignore file (javafxports#60)

* 8200749: Update javadoc build to enable tags used by JDK and fix broken URL
Reviewed-by: kcr

* 8130379: Enhance the Bounds class with getCenter method
Reviewed-by: kcr

* Added tag jdk-11+9 for changeset 4184d3dccefa

* 8200629: Update SQLite to version 3.23.0
Reviewed-by: kcr, mbilla

* 8192056: Memory leak when removing javafx.scene.shape.Sphere-objects from a group or container
Reviewed-by: kcr, nlisker

* 8185854: NPE on non-editable ComboBox in TabPane with custom Skin
Reviewed-by: kcr, arapte

* 8200587: Fix mistakes in FX API docs
Reviewed-by: kcr

* 8201176: gradle :web:test should print a warning if COMPILE_WEBKIT is false
Reviewed-by: kcr

* 8199357: Remove references to applets and Java Web Start from FX
Reviewed-by: prr, aghaisas

* 8200300: better gradle error message
Reviewed-by: kcr, arapte
Contributed-by: [email protected]

* Added tag jdk-11+10 for changeset b9915cc91652

* 8157690: [TabPane] Sorting tabs makes tab selection menu empty
Reviewed-by: kcr, aghaisas

* JDK-8195669 Cross Compile Arm Swing no longer fails (javafxports#58)

* add script used by jenkins job to sync with openjfx mercurial repository

* Fixes javafxports#54: Cross compile armv6hf build no longer fails with swing errors

* add timeout to antlr processing, fixing javafxports#25 (javafxports#68)

* 8199765: antlr timeout
Reviewed-by: kcr
Contributed-by: [email protected]

* 8177380: Add standard colors in ColorPicker color palette
Reviewed-by: nlisker, kcr

* 8202036: Update OpenJFX license files to match OpenJDK
Reviewed-by: prr

* 8195669: cross compiler on ARM fails
Reviewed-by: kcr
Contributed-by: [email protected], [email protected]

* 8167096: Add APIs to customize step repeat timing for Spinner control
Reviewed-by: kcr, aghaisas

* Added tag jdk-11+11 for changeset 299108465d55

* 8198329: Support FX build / test using JDK that doesn't include javafx.* modules
Reviewed-by: prr, jvos, aghaisas

* Added tag jdk-11+12 for changeset f29f3fbe6810

* Generate PDB (debugging files) and upload them via Appveyor. (javafxports#67)

targeting master branch

* (travis) Set CONF gradle property to 'DebugNative'. (javafxports#74)

* 8200418: webPage.executeCommand("removeFormat", null) removes the style of the body element
Reviewed-by: kcr, rkamath

* 8197987: Update libxslt to version 1.1.32
Reviewed-by: kcr, mbilla

* Added tag jdk-11+13 for changeset 1cf615e434d5

* 8196827: test.javafx.scene.control.ComboBoxTest - generates NullPointerException
Reviewed-by: kcr, arapte

* 8198602: [TestBug] test.javafx.css.StylesheetTest logs IllegalArgumentException
Reviewed-by: kcr, aghaisas

* 8196844: [TestBug] IllegalArgumentException gets logged in some of test.javafx.scene.* tests
Reviewed-by: kcr, aghaisas

* 8202368: Create jmods for standalone javafx modules
Reviewed-by: aghaisas, prr

* 8198601: [TestBug] test.robot.javafx.scene.layout.RegionBackgroundFillUITest logs IllegalArgumentException
Reviewed-by: kcr, aghaisas

* 8199344: [testbug] Illegal reflective access by NGTestBase
Reviewed-by: kcr, aghaisas

* 8201261: Ability to override the dependency repositories used by gradle
Reviewed-by: prr

* 8163795: [Windows] Remove call to StretchBlt in native GetScreenCapture method
Reviewed-by: kcr

* Added tag jdk-11+14 for changeset afd9c2c1828d

* 8193590: Memory leak when using WebView with Tooltip
Reviewed-by: kcr, arajkumar

* 8202623: [TEST_BUG] Some launcher tests will hang if underlying process exits too early
Reviewed-by: kcr, aghaisas

* 8203365: [TESTBUG] Mark MeshManagerCacheLeakTest as unstable until test is fixed
Reviewed-by: kcr

* 8203378: JDK build fails to compile javafx.graphics module-info.java if FX was built with OpenJDK
Reviewed-by: prr

* Unify master and develop branch (javafxports#80)

* Use correct status badge for appveyor (javafxports#82)

* JDK-8202396: Fix memory leak in ImageLoader.m (javafxports#73)

* 8199614: [macos] ImageCursor.getBestSize() throws NullPointerException
Reviewed-by: mbilla, arapte, kcr

* 8203294: [Linux] Link libgcc and libstdc++ statically to support gcc-7.x
Reviewed-by: kcr, mbilla

* 8201285: DateCell text color are not updated correctly when DateCell with disable = true is reused
Reviewed-by: aghaisas, kcr

* 8202396: memory leak ios imageloader
Reviewed-by: kcr
Contributed-by: [email protected]

* 8203698: JavaFX WebView crashes when visiting certain web sites
Reviewed-by: kcr, arajkumar
Contributed-by: [email protected], [email protected]

* Fix JDK-8202743: Dashed Stroke randomly painted incorrectly, may freeze application (javafxports#87)

8202743: Dashed Stroke randomly painted incorrectly, may freeze application
Reviewed-by: kcr

* 8129582: Controls slow considerably when displaying RTL-languages text on Linux
Reviewed-by: kcr

* 8202743: Dashed BasicStroke randomly painted incorrectly, may freeze application
Summary: fixed Dasher.init() to use the correct part [0; dashLen[
Reviewed-by: kcr

* [javafxports#85, javafxports#86] Use OpenJDK for CI, use "gradle all test" instead of "gradle build". (javafxports#88)

* Use OpenJDK instead of Oracle JDK for CI.

Fixes javafxports#86

* Run "gradle all test" instead of "gradle build" for CI.

Fixes javafxports#85

* 8195808: Eliminate dependency on sun.print in javafx.graphics
Reviewed-by: kcr

* Update WCFontImpl.java

// Guy Abossolo Foh : Implémentation pour corriger le Bug de MathML.

* Update FontJava.cpp

* Fix JDK-8201553: Update FX build to use gradle 4.8 (javafxports#92)

Reviewed-by: @prrace @johanvos @tiainen

* Merge changes from github/master before pushing (javafxports#91)

Pull changes from github master into local master before pushing to github

* 8201553: Update FX build to use gradle 4.8
Reviewed-by: prr, jvos

* Create gradle.properties

* Delete gradle.properties

* Create gradle.properties

* Update gradle.properties

Enable WebKit build.

* Update gradle.properties

* Update FontJava.cpp

* Update FontJava.cpp

Small change : wrong object return if not jFont.

* Update FontJava.cpp

* Update WCFontImpl.java

* Update WCFont.java

* Update FontJava.cpp

* Update WCFontPerfLogger.java

* Update WCFontImpl.java

* Create OpenJFXMathMLRenderingIssueTest

Test for :
- JDK-8147476 Rendering issues with MathML token elements
- JDK-8089878 HTMLEditor messes up MathML markup press

* Move file.

Kevin : If you need to display a window, it will need to go into tests/system instead of modules/javafx.web.

* Delete gradle.properties

Kevin : You need to remove the gradle.properties file. It should not be checked in.
scientificware added a commit to scientificware/openjdk-jfx that referenced this pull request Jun 13, 2018
* 8202393: App Transport Security blocks http media on macOS with JDK build using new compilers
Reviewed-by: kcr

* 8203801: Missing Classpath exception in PrismLoaderGlue.stg file
Reviewed-by: prr

* Update the master branch. (#10)

* Set the locale of the javadoc

Setting the locale to a fixed value when generating the javadoc ensures the output of the build doesn't depend on developer specific settings. This improves the reproducibility of the build.

* Fix PosixPlatform.cpp compilation with GCC 6

* Create CONTRIBUTING.md

* Fix launcher library compilation with GCC 6

* fix NPE in getMediaName()

* 8199841: Add gradle wrapper files to build
Reviewed-by: jvos
Contributed-by: [email protected]

* Add Gradle wrapper files

* Update ci scripts to use gradlew

* Gradle build failure should show informative message

* 8195799: Use System logger instead of platform logger in javafx modules
Reviewed-by: kcr, mchung, dfuchs, jvos

* Added tag jdk-11+7 for changeset 0cd88e183e61

* 8088769: Alphachannel for transparent colors is not shown in HtmlEditor
Reviewed-by: kcr, mbilla

* 8200277: Compiling native media code fails when using OpenJDK build as boot JDK

* Qt-dev tools are no longer needed by OpenJFX (javafxports#48)

* Additional updates needed for JDK-8199841 to add gradle wrapper files to build (javafxports#49)

1. Added the gradle.md license file
2. Replaced gradle-wrapper.jar with one generated from gradle 4.3 to match the version in the license file (we shouldn't need to update this again after this)
With the above changes, there should be no merge conflicts when JDK-8199841 is integrated to the upstream openjfx/jfx-dev repo.

* 8200277: Compiling native media code fails when using OpenJDK build as boot JDK
Reviewed-by: jvos, prr

* Added tag jdk-11+8 for changeset b956f9ea2553

* add script used by jenkins job to sync with openjfx mercurial repository

* 8193311: [Spinner] Default button not activated on ENTER
Reviewed-by: kcr, aghaisas

* Use JDK 10 on Travis CI and Appveyor. (javafxports#63)

* Created a basic .gitignore file (javafxports#60)

* Update ci scripts to use gradlew

* Qt-dev tools are no longer needed by OpenJFX (javafxports#48)

* Use JDK 10 on Travis CI and Appveyor. (javafxports#63)

* Created a basic .gitignore file (javafxports#60)

* 8200749: Update javadoc build to enable tags used by JDK and fix broken URL
Reviewed-by: kcr

* 8130379: Enhance the Bounds class with getCenter method
Reviewed-by: kcr

* Added tag jdk-11+9 for changeset 4184d3dccefa

* 8200629: Update SQLite to version 3.23.0
Reviewed-by: kcr, mbilla

* 8192056: Memory leak when removing javafx.scene.shape.Sphere-objects from a group or container
Reviewed-by: kcr, nlisker

* 8185854: NPE on non-editable ComboBox in TabPane with custom Skin
Reviewed-by: kcr, arapte

* 8200587: Fix mistakes in FX API docs
Reviewed-by: kcr

* 8201176: gradle :web:test should print a warning if COMPILE_WEBKIT is false
Reviewed-by: kcr

* 8199357: Remove references to applets and Java Web Start from FX
Reviewed-by: prr, aghaisas

* 8200300: better gradle error message
Reviewed-by: kcr, arapte
Contributed-by: [email protected]

* Added tag jdk-11+10 for changeset b9915cc91652

* 8157690: [TabPane] Sorting tabs makes tab selection menu empty
Reviewed-by: kcr, aghaisas

* JDK-8195669 Cross Compile Arm Swing no longer fails (javafxports#58)

* add script used by jenkins job to sync with openjfx mercurial repository

* Fixes javafxports#54: Cross compile armv6hf build no longer fails with swing errors

* add timeout to antlr processing, fixing javafxports#25 (javafxports#68)

* 8199765: antlr timeout
Reviewed-by: kcr
Contributed-by: [email protected]

* 8177380: Add standard colors in ColorPicker color palette
Reviewed-by: nlisker, kcr

* 8202036: Update OpenJFX license files to match OpenJDK
Reviewed-by: prr

* 8195669: cross compiler on ARM fails
Reviewed-by: kcr
Contributed-by: [email protected], [email protected]

* 8167096: Add APIs to customize step repeat timing for Spinner control
Reviewed-by: kcr, aghaisas

* Added tag jdk-11+11 for changeset 299108465d55

* 8198329: Support FX build / test using JDK that doesn't include javafx.* modules
Reviewed-by: prr, jvos, aghaisas

* Added tag jdk-11+12 for changeset f29f3fbe6810

* Generate PDB (debugging files) and upload them via Appveyor. (javafxports#67)

targeting master branch

* (travis) Set CONF gradle property to 'DebugNative'. (javafxports#74)

* 8200418: webPage.executeCommand("removeFormat", null) removes the style of the body element
Reviewed-by: kcr, rkamath

* 8197987: Update libxslt to version 1.1.32
Reviewed-by: kcr, mbilla

* Added tag jdk-11+13 for changeset 1cf615e434d5

* 8196827: test.javafx.scene.control.ComboBoxTest - generates NullPointerException
Reviewed-by: kcr, arapte

* 8198602: [TestBug] test.javafx.css.StylesheetTest logs IllegalArgumentException
Reviewed-by: kcr, aghaisas

* 8196844: [TestBug] IllegalArgumentException gets logged in some of test.javafx.scene.* tests
Reviewed-by: kcr, aghaisas

* 8202368: Create jmods for standalone javafx modules
Reviewed-by: aghaisas, prr

* 8198601: [TestBug] test.robot.javafx.scene.layout.RegionBackgroundFillUITest logs IllegalArgumentException
Reviewed-by: kcr, aghaisas

* 8199344: [testbug] Illegal reflective access by NGTestBase
Reviewed-by: kcr, aghaisas

* 8201261: Ability to override the dependency repositories used by gradle
Reviewed-by: prr

* 8163795: [Windows] Remove call to StretchBlt in native GetScreenCapture method
Reviewed-by: kcr

* Added tag jdk-11+14 for changeset afd9c2c1828d

* 8193590: Memory leak when using WebView with Tooltip
Reviewed-by: kcr, arajkumar

* 8202623: [TEST_BUG] Some launcher tests will hang if underlying process exits too early
Reviewed-by: kcr, aghaisas

* 8203365: [TESTBUG] Mark MeshManagerCacheLeakTest as unstable until test is fixed
Reviewed-by: kcr

* 8203378: JDK build fails to compile javafx.graphics module-info.java if FX was built with OpenJDK
Reviewed-by: prr

* Unify master and develop branch (javafxports#80)

* Use correct status badge for appveyor (javafxports#82)

* JDK-8202396: Fix memory leak in ImageLoader.m (javafxports#73)

* 8199614: [macos] ImageCursor.getBestSize() throws NullPointerException
Reviewed-by: mbilla, arapte, kcr

* 8203294: [Linux] Link libgcc and libstdc++ statically to support gcc-7.x
Reviewed-by: kcr, mbilla

* 8201285: DateCell text color are not updated correctly when DateCell with disable = true is reused
Reviewed-by: aghaisas, kcr

* 8202396: memory leak ios imageloader
Reviewed-by: kcr
Contributed-by: [email protected]

* 8203698: JavaFX WebView crashes when visiting certain web sites
Reviewed-by: kcr, arajkumar
Contributed-by: [email protected], [email protected]

* Fix JDK-8202743: Dashed Stroke randomly painted incorrectly, may freeze application (javafxports#87)

8202743: Dashed Stroke randomly painted incorrectly, may freeze application
Reviewed-by: kcr

* 8129582: Controls slow considerably when displaying RTL-languages text on Linux
Reviewed-by: kcr

* 8202743: Dashed BasicStroke randomly painted incorrectly, may freeze application
Summary: fixed Dasher.init() to use the correct part [0; dashLen[
Reviewed-by: kcr

* [javafxports#85, javafxports#86] Use OpenJDK for CI, use "gradle all test" instead of "gradle build". (javafxports#88)

* Use OpenJDK instead of Oracle JDK for CI.

Fixes javafxports#86

* Run "gradle all test" instead of "gradle build" for CI.

Fixes javafxports#85

* 8195808: Eliminate dependency on sun.print in javafx.graphics
Reviewed-by: kcr

* Update WCFontImpl.java

// Guy Abossolo Foh : Implémentation pour corriger le Bug de MathML.

* Update FontJava.cpp

* Fix JDK-8201553: Update FX build to use gradle 4.8 (javafxports#92)

Reviewed-by: @prrace @johanvos @tiainen

* Merge changes from github/master before pushing (javafxports#91)

Pull changes from github master into local master before pushing to github

* 8201553: Update FX build to use gradle 4.8
Reviewed-by: prr, jvos

* Create gradle.properties

* Delete gradle.properties

* Create gradle.properties

* Update gradle.properties

Enable WebKit build.

* Update gradle.properties

* Update FontJava.cpp

* Update FontJava.cpp

Small change : wrong object return if not jFont.

* Update FontJava.cpp

* Update WCFontImpl.java

* Update WCFont.java

* Update FontJava.cpp

* Update WCFontPerfLogger.java

* Update WCFontImpl.java

* Create OpenJFXMathMLRenderingIssueTest

Test for :
- JDK-8147476 Rendering issues with MathML token elements
- JDK-8089878 HTMLEditor messes up MathML markup press

* Move file.

Kevin : If you need to display a window, it will need to go into tests/system instead of modules/javafx.web.

* Delete gradle.properties

Kevin : You need to remove the gradle.properties file. It should not be checked in.

* Update OpenJFXMathMLRenderingIssueTest

* Update WCFontImpl.java

* Update WCFont.java

* Update WCFontImpl.java

* Update FontJava.cpp

* Update WCFontPerfLogger.java
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants