[GR-29053] Merge in 21.0-b06 and final Jan CPU OpenJDK8 changes.

PullRequest: graal-jvmci-8/357
graalvm · Feb 3, 2021 · 71b1a5c · 71b1a5c
2 parents 264143b + d837813
commit 71b1a5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1402,3 +1402,4 @@ b36c3f635d937798abe5e7c5a40a868705fed15e jdk8u275-ga
 d7c102fe9c4736bca65b25da69093d84da141e65 jdk8u282-b04
 d84cbe66ce9f5a4ea0a2e6c0fa99535248d32f00 jdk8u282-b05
 a29ba3f778d781d63dc725b24526ef4ad3cd5931 jdk8u282-b06
+3d42d5d7117dc6559c0d71fc8fceaaab96de376f jdk8u282-b07
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -91,7 +91,7 @@
 
     OpenJDK:: {
         local jdk_version = "8u282",
-        local jdk_build = "07",
+        local jdk_build = "08",
 
         name+: "-openjdk",
         downloads+: {
@@ -109,7 +109,7 @@
     },
 
     # Downstream Graal branch to test against.
-    local downstream_branch = "ds/GR-24732", # Needed to pass CheckGraalIntrinsics in context of JFR backport
+    local downstream_branch = "master",
 
     # Only need to test formatting and building
     # with Eclipse on one platform.
@@ -268,7 +268,7 @@
     # GraalVM CE is not supported on Solaris-SPARC
     local graalvm_test_confs = [
         self.Linux + self.AMD64 + self.OpenJDK,
-        self.Darwin + self.AMD64 + self.OpenJDK,
+        # GR-29152 self.Darwin + self.AMD64 + self.OpenJDK,
         self.Windows + self.AMD64 + self.OpenJDK
     ],