java 16 build

yermak · Aug 15, 2021 · eaebc6f · eaebc6f
1 parent 24a85aa
commit eaebc6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -3,6 +3,7 @@ pool:
 
 variables:
   MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)\.m2\repository
+  JDK_CACHE_FOLDER: $(Pipeline.Workspace)\jdk-16.0.2
   MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
 
 steps:
@@ -19,7 +20,7 @@ steps:
   - script: |
       choco install wget --no-progress
       wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
-      unzip openjdk-16.0.2_windows-x64_bin.zip
+      7z.exe x openjdk-16.0.2_windows-x64_bin.zip
       setx JAVA_HOME jdk-16.0.2
       call refreshenv
       call mvn -X clean package -Dexec.skip=true --no-transfer-progress $(MAVEN_OPTS)

diff --git a/build_binaries.yml b/build_binaries.yml
@@ -88,7 +88,7 @@ jobs:
         choco install 7zip --no-progress
         choco install wget --no-progress
         wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
-        unzip openjdk-16.0.2_windows-x64_bin.zip
+        7z.exe x openjdk-16.0.2_windows-x64_bin.zip
         setx JAVA_HOME jdk-16.0.2
         call refreshenv
         wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip

diff --git a/release-all.yml b/release-all.yml
@@ -91,10 +91,10 @@ jobs:
         choco install 7zip --no-progress
         choco install wget --no-progress
         wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
-        unzip openjdk-16.0.2_windows-x64_bin.zip
+        7z.exe x openjdk-16.0.2_windows-x64_bin.zip
         setx JAVA_HOME jdk-16.0.2
         call refreshenv
-        wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
+        wget https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
         7z.exe x openjfx-16_windows-x64_bin-jmods.zip
         SET JAVAFX_JMODS=javafx-jmods-16