From cfceadfefe62ddc0a7ac4426990f5c4028e832fd Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 30 Jan 2020 10:46:39 -0800 Subject: [PATCH 1/2] Fix java 14 url to point to always existing version --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a5413223a4..6ff0a5cc48 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ jobs: - script: | $ProgressPreference = 'SilentlyContinue' mkdir build - wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_linux-x64_bin.tar.gz" -O "build/jdk-14.tar.gz" + wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_linux-x64_bin.tar.gz" -O "build/jdk-14.tar.gz" sudo mkdir /opt/java sudo tar -xzvf build/jdk-14.tar.gz -C /opt/java displayName: 'Download JDK 14' @@ -76,7 +76,7 @@ jobs: displayName: 'Download JDK' - powershell: | $ProgressPreference = 'SilentlyContinue' - wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip" -O "build\jdk-14.zip" + wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_windows-x64_bin.zip" -O "build\jdk-14.zip" Expand-Archive build\jdk-14.zip -DestinationPath build displayName: 'Download JDK 14' - task: JavaToolInstaller@0 @@ -130,7 +130,7 @@ jobs: displayName: 'Download JDK' - powershell: | $ProgressPreference = 'SilentlyContinue' - wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_windows-x64_bin.zip" -O "build\jdk-14.zip" + wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_windows-x64_bin.zip" -O "build\jdk-14.zip" Expand-Archive build\jdk-14.zip -DestinationPath build displayName: 'Download JDK 14' - task: JavaToolInstaller@0 @@ -173,7 +173,7 @@ jobs: - script: | mkdir build wget "https://download.java.net/java/ga/jdk11/openjdk-11_osx-x64_bin.tar.gz" -O "build/jdk.tar.gz" - wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_osx-x64_bin.tar.gz" -O "build/jdk-14.tar.gz" + wget "https://first.wpi.edu/FRC/roborio/jpackage/openjdk-14-ea+28_osx-x64_bin.tar.gz" -O "build/jdk-14.tar.gz" sudo tar xzvf build/jdk-14.tar.gz -C /Library/Java/JavaVirtualMachines/ sudo tar xvzf build/jdk.tar.gz -C /Library/Java/JavaVirtualMachines/ export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home/ From 6f5d65f8739922f9ec57c7c3cf504a5ede1f10ff Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 8 Feb 2020 08:21:55 -0800 Subject: [PATCH 2/2] Fix jpackage build --- azure-pipelines.yml | 1 - buildSrc/src/main/kotlin/JpackageExec.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6ff0a5cc48..5a14fc0b70 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -90,7 +90,6 @@ jobs: workingDirectory: '' gradleWrapperFile: 'gradlew' gradleOptions: '-Xmx3072m' - jdkVersionOption: '1.11' jdkArchitectureOption: 'x64' publishJUnitResults: true tasks: 'check :ui:jpackage -Pheadless=true -Pgeneration -PlogTests -PskipUITests -Pjdk14=..\build\jdk-14 --stacktrace' diff --git a/buildSrc/src/main/kotlin/JpackageExec.kt b/buildSrc/src/main/kotlin/JpackageExec.kt index bee7f60c55..b7c3886e70 100644 --- a/buildSrc/src/main/kotlin/JpackageExec.kt +++ b/buildSrc/src/main/kotlin/JpackageExec.kt @@ -234,7 +234,7 @@ open class JpackageExec : DefaultTask() { fileAssociations.ifPresent { propsFile -> args.addAll("--file-associations", propsFile.asFile.absolutePath) } - args.addAll("--package-type", installerType.get()) + args.addAll("--type", installerType.get()) when (OperatingSystem.current()) { OperatingSystem.WINDOWS -> {