[GR-37553] Prepare 22.1.

PullRequest: truffleruby/3252

Author: gilles-duboscq

.gitattributes

@@ -1,7 +1,3 @@
-# Merge options
-
-/CHANGELOG.md merge=union
-
 # Rules for GitHub's Linguist language-classification system. We're abusing the
 # 'vendored' attribute to exclude files as a lot of this isn't really vendored,
 # and a whole lot of actually vendored code isn't listed! What we want to do is

ci.jsonnet

@@ -10,7 +10,7 @@
 # https://github.com/google/jsonnet/releases and compiled.
 
 # CONFIGURATION
-local overlay = "ffb092a26e86b0b4c2ac33bdbc329d938b527942";
+local overlay = "ebdbbc69acb39ec69dc6bdc6c1f616227edc1931";
 
 # For debugging: generated builds will be restricted to those listed in
 # the array. No restriction is applied when it is empty.
@@ -45,6 +45,7 @@ local part_definitions = {
 
       packages+: {
         "pip:ninja_syntax": "==1.7.2",  # Required by NFI and mx
+        "mx": "5.320.4",
       },
 
       setup+: [
@@ -244,7 +245,7 @@ local part_definitions = {
       },
     },
 
-    local darwin_deps = common.sulong.deps.darwin + {
+    local darwin_deps = common.sulong.deps.darwin_amd64 + {
       packages+: {
         ruby: "==3.0.2",
       },

common.json

@@ -4,18 +4,18 @@
   "jdks": {
     "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.15+4-jvmci-22.1-b02", "platformspecific": true },
-    "labsjdk-ce-11-llvm": {"name": "labsjdk",   "version": "ce-11.0.15+4-jvmci-22.1-b02-sulong", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.15+7-jvmci-22.1-b02", "platformspecific": true },
-    "labsjdk-ee-11-llvm": {"name": "labsjdk",   "version": "ee-11.0.15+7-jvmci-22.1-b02-sulong", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.15+5-jvmci-22.1-b03", "platformspecific": true },
+    "labsjdk-ce-11-llvm": {"name": "labsjdk",   "version": "ce-11.0.15+5-jvmci-22.1-b03-sulong", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.15+8-jvmci-22.1-b03", "platformspecific": true },
+    "labsjdk-ee-11-llvm": {"name": "labsjdk",   "version": "ee-11.0.15+8-jvmci-22.1-b03-sulong", "platformspecific": true },
 
     "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.3+4-jvmci-22.1-b02", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.3+4-jvmci-22.1-b02-debug", "platformspecific": true },
-    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.3+4-jvmci-22.1-b02-sulong", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.3+7-jvmci-22.1-b02", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.3+7-jvmci-22.1-b02-debug", "platformspecific": true },
-    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.3+7-jvmci-22.1-b02-sulong", "platformspecific": true }
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.3+4-jvmci-22.1-b03", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.3+4-jvmci-22.1-b03-debug", "platformspecific": true },
+    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.3+4-jvmci-22.1-b03-sulong", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.3+8-jvmci-22.1-b03", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.3+8-jvmci-22.1-b03-debug", "platformspecific": true },
+    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.3+8-jvmci-22.1-b03-sulong", "platformspecific": true }
   },
 
   "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
@@ -96,11 +96,16 @@
           "cmake": "==3.15.2"
         }
       },
-      "darwin": {
+      "darwin_amd64": {
         "packages": {
           "cmake": "==3.15.2"
         }
       },
+      "darwin_aarch64": {
+        "packages": {
+          "cmake": "==3.22.2"
+        }
+      },
       "windows": {
         "packages": {
           "msvc": "==10.0",
@@ -165,7 +170,8 @@
           "ruby": ">=2.1.0"
         }
       },
-      "darwin": {},
+      "darwin_amd64": {},
+      "darwin_aarch64": {},
       "windows": {}
     }
   }

lib/cext/ABI_version.txt

@@ -1 +1 @@
-14
+22.1.0

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "133a7d86a7938f0a677c88b295851d4c2b56b792",
+                "version": "dc6d58f4b9415dab2e0a2a6df27943b65f8e0cad",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "133a7d86a7938f0a677c88b295851d4c2b56b792",
+                "version": "dc6d58f4b9415dab2e0a2a6df27943b65f8e0cad",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},