Skip to content
This repository has been archived by the owner on Aug 23, 2022. It is now read-only.

Commit

Permalink
revert JDK-8285445, jfx update
Browse files Browse the repository at this point in the history
  • Loading branch information
@akashche
akashche committed Apr 30, 2022
1 parent edd759d commit 69b6381
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion lookaside/java-1.8.0-openjdk
Submodule java-1.8.0-openjdk updated 2 files
+5 −4 jdk/src/windows/classes/java/io/WinNTFileSystem.java
+0 −52 jdk/test/java/io/FileOutputStream/OpenNUL.java
2 changes: 1 addition & 1 deletion lookaside/java-11-openjdk
Submodule java-11-openjdk updated 2 files
+5 −4 src/java.base/windows/classes/java/io/WinNTFileSystem.java
+0 −52 test/jdk/java/io/FileOutputStream/OpenNUL.java
2 changes: 1 addition & 1 deletion lookaside/java-17-openjdk
Submodule java-17-openjdk updated 2 files
+5 −4 src/java.base/windows/classes/java/io/WinNTFileSystem.java
+0 −52 test/jdk/java/io/FileOutputStream/OpenNUL.java
42 changes: 21 additions & 21 deletions resources/ci/azure-pipelines.yml
View file
Expand Up @@ -16,19 +16,19 @@ trigger:
- master

variables:
OJDKBUILD_JDK8_TAG: java-1.8.0-openjdk-1.8.0.322-1.b06
OJDKBUILD_JDK8_DEBUG_TAG: java-1.8.0-openjdk-debug-1.8.0.322-1.b06
OJDKBUILD_JDK8_32_TAG: java-1.8.0-openjdk-1.8.0.322-1.b06-x86
OJDKBUILD_JDK8_32_DEBUG_TAG: java-1.8.0-openjdk-debug-1.8.0.322-1.b06-x86
OJDKBUILD_JDK8_VS15_TAG: java-1.8.0-openjdk-1.8.0.322-1.b06-vs15
OJDKBUILD_JDK8_VS15_DEBUG_TAG: java-1.8.0-openjdk-debug-1.8.0.322-1.b06-vs15
OJDKBUILD_JDK8_RPMBUILD: 0
OJDKBUILD_JDK11_TAG: java-11-openjdk-11.0.14.9-2
OJDKBUILD_JDK11_DEBUG_TAG: java-11-openjdk-debug-11.0.14.9-2
OJDKBUILD_JDK11_RPMBUILD: 2
OJDKBUILD_JDK17_TAG: java-17-openjdk-17.0.2.0.8-1
OJDKBUILD_JDK17_DEBUG_TAG: java-17-openjdk-debug-17.0.2.0.8-1
OJDKBUILD_JDK17_RPMBUILD: 0
OJDKBUILD_JDK8_TAG: java-1.8.0-openjdk-1.8.0.332-1.b09
OJDKBUILD_JDK8_DEBUG_TAG: java-1.8.0-openjdk-debug-1.8.0.332-1.b09
OJDKBUILD_JDK8_32_TAG: java-1.8.0-openjdk-1.8.0.332-1.b09-x86
OJDKBUILD_JDK8_32_DEBUG_TAG: java-1.8.0-openjdk-debug-1.8.0.332-1.b09-x86
OJDKBUILD_JDK8_VS15_TAG: java-1.8.0-openjdk-1.8.0.332-1.b09-vs15
OJDKBUILD_JDK8_VS15_DEBUG_TAG: java-1.8.0-openjdk-debug-1.8.0.332-1.b09-vs15
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_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

jobs:

Expand All @@ -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: false
enabled: true
- job: jdk8_debug
timeoutInMinutes: 0
Expand All @@ -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: false
enabled: true
- job: jdk8_32
timeoutInMinutes: 0
Expand All @@ -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: false
enabled: true
- job: jdk8_32_debug
timeoutInMinutes: 0
Expand All @@ -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: false
enabled: true
- job: jdk8_vs15
timeoutInMinutes: 0
Expand All @@ -138,7 +138,7 @@ jobs:
nmake installer || exit /b 1
popd || exit /b 1
dir dist || exit /b 1
enabled: false
enabled: true
- job: jdk8_vs15_debug
timeoutInMinutes: 0
Expand All @@ -159,7 +159,7 @@ jobs:
nmake zip_debug || exit /b 1
popd || exit /b 1
dir dist || exit /b 1
enabled: false
enabled: true
- job: jdk11
timeoutInMinutes: 0
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
popd || exit /b 1
dir dist || exit /b 1
if not "$(OJDKBUILD_JDK17_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK17_TAG) dist || exit /b 1
enabled: false
enabled: true
- job: jdk17_debug
timeoutInMinutes: 0
Expand All @@ -239,4 +239,4 @@ jobs:
popd || exit /b 1
dir dist || exit /b 1
if not "$(OJDKBUILD_JDK17_RPMBUILD)" == "0" tools\ghr\ghr.exe -t $(OJDKBUILD_GITHUB_TOKEN) -u ojdkbuild -r ojdkbuild -c $(Build.SourceVersion) $(OJDKBUILD_JDK17_DEBUG_TAG) dist || exit /b 1
enabled: false
enabled: true
2 changes: 1 addition & 1 deletion upstream/openjfx-8u
Submodule openjfx-8u updated 3 files
+19 −0 modules/web/src/main/java/com/sun/javafx/webkit/prism/RTImage.java
+28 −12 modules/web/src/main/native/Source/WebCore/platform/graphics/java/ImageBufferJavaBackend.cpp
+6 −1 modules/web/src/main/native/Source/WebCore/platform/graphics/java/ImageJava.cpp

0 comments on commit 69b6381

Please sign in to comment.