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

Update jpackage to release 64 #955

Merged
merged 1 commit into from
Oct 30, 2019
Merged

Update jpackage to release 64 #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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-49_linux-x64_bin.tar.gz" -O "build/jdk-14.tar.gz"
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"
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-49_windows-x64_bin.zip" -O "build\jdk-14.zip"
wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_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 @@ -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-49_windows-x64_bin.zip" -O "build\jdk-14.zip"
wget "https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-64_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 +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-49_osx-x64_bin.tar.gz" -O "build/jdk-14.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"
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
3 changes: 1 addition & 2 deletions ui/ui.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,7 @@ fun JpackageExec.configureForCurrentOs() {
OperatingSystem.LINUX -> {
val installerFileDir = installerFilesBaseDir.resolve("linux")
resourceDir.set(installerFileDir)
// Skip icon on linux, causing build to break
//icon.set(installerFileDir.resolve("GRIP.png"))
Copy link
Member

Choose a reason for hiding this comment

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

This this intentional?

icon.set(installerFileDir.resolve("GRIP.png"))
installerType.set("deb")
}
}
Expand Down