8-vs15 and 17 ci fix

ojdkbuild · May 3, 2022 · 33457ac · 33457ac
1 parent 69b6381
commit 33457ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/resources/ci/azure-pipelines.yml b/resources/ci/azure-pipelines.yml
@@ -25,7 +25,7 @@ variables:
   OJDKBUILD_JDK8_RPMBUILD: 1
   OJDKBUILD_JDK11_TAG: java-11-openjdk-11.0.15.9-1
   OJDKBUILD_JDK11_DEBUG_TAG: java-11-openjdk-debug-11.0.15.9-1
-  OJDKBUILD_JDK11_RPMBUILD: 1
+  OJDKBUILD_JDK11_RPMBUILD: 0
   OJDKBUILD_JDK17_TAG: java-17-openjdk-17.0.3.0.6-1
   OJDKBUILD_JDK17_DEBUG_TAG: java-17-openjdk-debug-17.0.3.0.6-1
   OJDKBUILD_JDK17_RPMBUILD: 1
@@ -50,7 +50,7 @@ jobs:
       popd || exit /b 1
       dir dist || exit /b 1
       if not "$(OJDKBUILD_JDK8_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK8_TAG) dist || exit /b 1
-    enabled: true
+    enabled: false
 
 - job: jdk8_debug
   timeoutInMinutes: 0
@@ -70,7 +70,7 @@ jobs:
       popd || exit /b 1
       dir dist || exit /b 1
       if not "$(OJDKBUILD_JDK8_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK8_DEBUG_TAG) dist || exit /b 1
-    enabled: true
+    enabled: false
 
 - job: jdk8_32
   timeoutInMinutes: 0
@@ -97,7 +97,7 @@ jobs:
       popd || exit /b 1
       dir dist || exit /b 1
       if not "$(OJDKBUILD_JDK8_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK8_32_TAG) dist || exit /b 1
-    enabled: true
+    enabled: false
 
 - job: jdk8_32_debug
   timeoutInMinutes: 0
@@ -117,7 +117,7 @@ jobs:
       popd || exit /b 1
       dir dist || exit /b 1
       if not "$(OJDKBUILD_JDK8_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK8_32_DEBUG_TAG) dist || exit /b 1
-    enabled: true
+    enabled: false
 
 - job: jdk8_vs15
   timeoutInMinutes: 0
@@ -179,7 +179,7 @@ jobs:
       popd || exit /b 1
       dir dist || exit /b 1
       if not "$(OJDKBUILD_JDK11_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK11_TAG) dist || exit /b 1
-    enabled: true
+    enabled: false
 
 - job: jdk11_debug
   timeoutInMinutes: 0
@@ -199,7 +199,7 @@ jobs:
       popd || exit /b 1
       dir dist || exit /b 1
       if not "$(OJDKBUILD_JDK11_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK11_DEBUG_TAG) dist || exit /b 1
-    enabled: true
+    enabled: false
 
 - job: jdk17
   timeoutInMinutes: 0

diff --git a/resources/scripts/set-compile-env-vs15-x86_64-jdk8.bat b/resources/scripts/set-compile-env-vs15-x86_64-jdk8.bat
@@ -67,11 +67,11 @@ rem set path
 set PATH=%VSINSTALLDIR%/VC/Tools/MSVC/14.16.27023/bin/HostX64/x64
 set PATH=%PATH%;%WindowsSdkDir%/bin/10.0.17763.0/x64;%VSINSTALLDIR%/Common7/Tools/;%VSINSTALLDIR%/VC/Redist/MSVC/14.16.27012/x64/Microsoft.VC141.CRT/
 set PATH=%PATH%;%WindowsSdkDir%/Redist/10.0.17763.0/ucrt/DLLs/x64;%WindowsSdkDir%/Redist/10.0.17763.0/ucrt/DLLs/x86;
-set PATH=%PATH%;C:/Windows/system32;C:/Windows;C:/Windows/System32/Wbem
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/cmake/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/pkgconfig/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/nasm
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/make
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/perl520/perl/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/maven/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/resources/scripts
+set PATH=%PATH%;C:/Windows/system32;C:/Windows;C:/Windows/System32/Wbem
diff --git a/resources/scripts/set-compile-env-vs16-x86_64.bat b/resources/scripts/set-compile-env-vs16-x86_64.bat
@@ -35,9 +35,9 @@ set PATH=%OJDKBUILD_DIR%/tools/cygwin_jdk11/bin/path_prepend
 set PATH=%PATH%;%WindowsSdkDir%/bin/10.0.19041.0/x64;%WindowsSdkDir%/bin/x64;%WindowsSdkDir%/bin/10.0.19041.0/x86
 set PATH=%PATH%;%VSINSTALLDIR%/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64
 
-set PATH=%PATH%;C:/Windows/system32;C:/Windows;C:/Windows/System32/Wbem
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/cmake/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/pkgconfig/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/cygwin_jdk11/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/tools/maven/bin
 set PATH=%PATH%;%OJDKBUILD_DIR%/resources/scripts
+set PATH=%PATH%;C:/Windows/system32;C:/Windows;C:/Windows/System32/Wbem