Skip to content

Commit 508d6ea

Browse files
authoredAug 17, 2020
Update to release Java 14 for jpackage (#965)
1 parent 3e2210a commit 508d6ea

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed
 

‎azure-pipelines.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ stages:
2424
- script: |
2525
$ProgressPreference = 'SilentlyContinue'
2626
mkdir build
27-
wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_linux-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
27+
wget "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz" -O "build/jdk-14.tar.gz"
2828
sudo mkdir /opt/java
2929
sudo tar -xzvf build/jdk-14.tar.gz -C /opt/java
3030
displayName: 'Download JDK 14'
@@ -34,7 +34,7 @@ stages:
3434
gradleWrapperFile: 'gradlew'
3535
gradleOptions: '-Xmx3072m'
3636
publishJUnitResults: false
37-
tasks: 'check :ui:jpackage -Pgeneration -PjniLocation=build/OpenCVJNI -Pheadless=true -PlogTests -Pjdk14=/opt/java/jdk-14 --stacktrace'
37+
tasks: 'check :ui:jpackage -Pgeneration -PjniLocation=build/OpenCVJNI -Pheadless=true -PlogTests -Pjdk14=/opt/java/jdk-14.0.1+7 --stacktrace'
3838
- task: PublishPipelineArtifact@1
3939
inputs:
4040
targetPath: 'ui/build/installer'
@@ -52,7 +52,7 @@ stages:
5252
gradleWrapperFile: 'gradlew'
5353
gradleOptions: '-Xmx3072m'
5454
publishJUnitResults: false
55-
tasks: ':ui:jpackage -Pcuda -Pjdk14=/opt/java/jdk-14 --stacktrace'
55+
tasks: ':ui:jpackage -Pcuda -Pjdk14=/opt/java/jdk-14.0.1+7 --stacktrace'
5656
- task: PublishPipelineArtifact@1
5757
inputs:
5858
targetPath: 'ui/build/installer'
@@ -69,11 +69,11 @@ stages:
6969
- powershell: |
7070
mkdir build
7171
$ProgressPreference = 'SilentlyContinue'
72-
wget "https://download.java.net/java/ga/jdk11/openjdk-11_windows-x64_bin.zip" -O "build\jdk.zip"
72+
wget "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2/OpenJDK11U-jdk_x64_windows_hotspot_11.0.7_10.zip" -O "build\jdk.zip"
7373
displayName: 'Download JDK'
7474
- powershell: |
7575
$ProgressPreference = 'SilentlyContinue'
76-
wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_windows-x64_bin.zip" -O "build\jdk-14.zip"
76+
wget "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7.1/OpenJDK14U-jdk_x64_windows_hotspot_14.0.1_7.zip" -O "build\jdk-14.zip"
7777
Expand-Archive build\jdk-14.zip -DestinationPath build
7878
displayName: 'Download JDK 14'
7979
- task: JavaToolInstaller@0
@@ -89,7 +89,7 @@ stages:
8989
gradleOptions: '-Xmx3072m'
9090
jdkArchitectureOption: 'x64'
9191
publishJUnitResults: true
92-
tasks: 'check :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -PskipUITests -Pjdk14=..\build\jdk-14 --stacktrace'
92+
tasks: 'check :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -PskipUITests -Pjdk14=..\build\jdk-14.0.1+7 --stacktrace'
9393
- task: PublishPipelineArtifact@1
9494
inputs:
9595
targetPath: 'ui/build/installer'
@@ -100,7 +100,7 @@ stages:
100100
gradleWrapperFile: 'gradlew'
101101
gradleOptions: '-Xmx3072m'
102102
publishJUnitResults: false
103-
tasks: ':ui:jpackage -Pcuda -PskipUITests -Pjdk14=..\build\jdk-14 --stacktrace'
103+
tasks: ':ui:jpackage -Pcuda -PskipUITests -Pjdk14=..\build\jdk-14.0.1+7 --stacktrace'
104104
- task: PublishPipelineArtifact@1
105105
inputs:
106106
targetPath: 'ui/build/installer'
@@ -117,11 +117,11 @@ stages:
117117
- powershell: |
118118
mkdir build
119119
$ProgressPreference = 'SilentlyContinue'
120-
wget "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.4_11.zip" -O "build\jdk.zip"
120+
wget "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2/OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.7_10.zip" -O "build\jdk.zip"
121121
displayName: 'Download JDK'
122122
- powershell: |
123123
$ProgressPreference = 'SilentlyContinue'
124-
wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_windows-x64_bin.zip" -O "build\jdk-14.zip"
124+
wget "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7.1/OpenJDK14U-jdk_x86-32_windows_hotspot_14.0.1_7.zip" -O "build\jdk-14.zip"
125125
Expand-Archive build\jdk-14.zip -DestinationPath build
126126
displayName: 'Download JDK 14'
127127
- task: JavaToolInstaller@0
@@ -137,7 +137,7 @@ stages:
137137
gradleOptions: '-Xmx1024m'
138138
publishJUnitResults: false
139139
# TODO: run :ui:jpackage once we have a JDK 13 build for 32-bit Windows
140-
tasks: 'check :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -PskipUITests -Pjdk14=..\build\jdk-14 --stacktrace'
140+
tasks: 'check :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -PskipUITests -Pjdk14=..\build\jdk-14.0.1+7 --stacktrace'
141141
# bytedeco does not have a 32 bit enabled CUDA build
142142
# - task: Gradle@2
143143
# inputs:
@@ -159,8 +159,8 @@ stages:
159159
steps:
160160
- script: |
161161
mkdir build
162-
wget "https://download.java.net/java/ga/jdk11/openjdk-11_osx-x64_bin.tar.gz" -O "build/jdk.tar.gz"
163-
wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_osx-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
162+
wget "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.7_10.tar.gz" -O "build/jdk.tar.gz"
163+
wget "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_mac_hotspot_14.0.1_7.tar.gz" -O "build/jdk-14.tar.gz"
164164
sudo tar xzvf build/jdk-14.tar.gz -C /Library/Java/JavaVirtualMachines/
165165
sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/
166166
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/
@@ -173,7 +173,7 @@ stages:
173173
jdkVersionOption: '1.11'
174174
jdkArchitectureOption: 'x64'
175175
publishJUnitResults: false
176-
tasks: 'check jacocoTestReport jacocoRootReport :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -Pjdk14=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home/ --stacktrace'
176+
tasks: 'check jacocoTestReport jacocoRootReport :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -Pjdk14=/Library/Java/JavaVirtualMachines/jdk-14.0.1+7/Contents/Home/ --stacktrace'
177177
- task: PublishPipelineArtifact@1
178178
inputs:
179179
targetPath: 'ui/build/installer'

0 commit comments

Comments
 (0)