[GR-39238] prepare 22.2

PullRequest: truffleruby/3402

Author: eregon

.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 = "52900f1ecd0b7b23e0bbb74e7552886e6ec29df3";
+local overlay = "1039a1d12d8e7c25c77a25fd6ee3a3b319743280";
 
 # For debugging: generated builds will be restricted to those listed in
 # the array. No restriction is applied when it is empty.
@@ -46,7 +46,7 @@ local part_definitions = {
       },
 
       packages+: {
-        mx: "HEAD",
+        mx: "6.1.4",
         python3: "==3.8.10", # For mx
         "pip:ninja_syntax": "==1.7.2",  # Required by NFI and mx
       },

common.json

@@ -134,8 +134,7 @@
       "common": {},
       "linux": {
         "packages": {
-          "binutils": "==2.23.2",
-          "gcc": "==8.3.0",
+          "00:devtoolset": "==7",
           "cmake": "==3.15.2"
         }
       },
@@ -163,14 +162,14 @@
       },
       "linux_amd64": {
         "packages": {
-          "devtoolset": "==7",
-          "binutils": ">=2.34",
+          "00:devtoolset": "==7",
+          "01:binutils": ">=2.34",
           "ruby": ">=2.1.0"
         }
       },
       "linux_aarch64": {
         "packages": {
-          "devtoolset": "==7",
+          "00:devtoolset": "==7",
           "ruby": ">=2.1.0"
         }
       },

lib/cext/ABI_version.txt

@@ -1 +1 @@
-7
+22.2.0

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "2facc6db4becbea40867fa98c6248f66571d8a0a",
+                "version": "f33384d85f86bc5f4fd1a92d9d734309c64d381d",
                 "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": "2facc6db4becbea40867fa98c6248f66571d8a0a",
+                "version": "f33384d85f86bc5f4fd1a92d9d734309c64d381d",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},