Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix java 14 url to point to always existing version #960

Merged
merged 2 commits into from
Feb 13, 2020
Merged

Fix java 14 url to point to always existing version #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfceadf
Fix java 14 url to point to always existing version
ThadHouse Jan 30, 2020
6f5d65f
Fix jpackage build
ThadHouse Feb 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -130,7 +129,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
Expand Down Expand Up @@ -173,7 +172,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/
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/JpackageExec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Copy link
Member

Choose a reason for hiding this comment

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

Why is this change necessary?

Copy link
Contributor Author

@ThadHouse ThadHouse Feb 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Because they keep changing flags in jpackage. That's why we're going to a fixed version we're hosting. At least until final java 14 comes out.


when (OperatingSystem.current()) {
OperatingSystem.WINDOWS -> {
Expand Down