fix path to jpackage jdk on Mac

brunoborges · Nov 26, 2019 · 43426d6 · 43426d6
1 parent d385712
commit 43426d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ jobs:
       pool:
         vmImage: ubuntu-16.04
       jpkgjdk: jdk14jpackagelinux
-      jpkgdir: jdk-14'
+      jpkgdir: jdk-14
 
   # Mac OS job
   - template: build-job.yml

diff --git a/build-job.yml b/build-job.yml
@@ -9,8 +9,6 @@ parameters:
 jobs:
 - job: ${{ parameters.name }}
   pool: ${{ parameters.pool }}
-  variables:
-    jpkgdir: ${{ parameters.jpkgdir }}
   steps:
     - task: DownloadPackage@1
       inputs:
@@ -33,7 +31,7 @@ jobs:
         jdkArchitectureOption: 'x64'
         publishJUnitResults: false
         tasks: dist jpackage
-        gradleOptions: -Dbadass.jlink.jpackage.home=$(System.DefaultWorkingDirectory)/$(jpkgdir)
+        gradleOptions: -Dbadass.jlink.jpackage.home=$(System.DefaultWorkingDirectory)/${{ parameters.jpkgdir }}
     - task: PublishBuildArtifacts@1
       inputs:
         pathToPublish: $(System.DefaultWorkingDirectory)/build/distributions/

diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,7 @@ jlink {
 
     jpackage {
         // can be set with BADASS_JLINK_JPACKAGE_HOME
-        jpackageHome = "/Users/bruno/fxderek/jdk-14.jdk/Contents/Home"
+        // jpackageHome = "/Users/bruno/fxderek/jdk-14.jdk/Contents/Home"
         outputDir = "installer"
         imageName = 'fx2048'
         skipInstaller = false