[GR-50709] Prepare 24.0

PullRequest: truffleruby/4093

Author: imanemamri

.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

doc/contributor/prepare-release-branch.md

@@ -12,6 +12,6 @@ So any backported changelog change can be reviewed if it is under the correct re
 
 ## Use the GraalVM release version as ABI version
 
-Similar to https://github.com/oracle/truffleruby/commit/6ecaee25be7949f8354444723bf6a71269e048ab.
+In `lib/cext/include/truffleruby/truffleruby-abi-version.h`, similar to https://github.com/oracle/truffleruby/commit/0e920e6959166ea9a2d93f6130cd18ef9638806f.
 
 This avoids any potential reuse of truffleuby-head gems which could otherwise have the same ABI version but with a different meaning.

lib/cext/include/truffleruby/truffleruby-abi-version.h

@@ -10,6 +10,6 @@
 // $RUBY_VERSION must be the same as TruffleRuby.LANGUAGE_VERSION.
 // $ABI_NUMBER starts at 1 and is incremented for every ABI-incompatible change.
 
-#define TRUFFLERUBY_ABI_VERSION "3.2.2.8"
+#define TRUFFLERUBY_ABI_VERSION "3.2.2.24.0.0.1"
 
 #endif

mx.truffleruby/suite.py

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