[GR-44714] [GR-49652] Move darwin-amd64 CI from Mojave to Big Sur

PullRequest: truffleruby/4062
oracle · Jan 8, 2024 · 29fb038 · 29fb038
2 parents 4516fc1 + 0bc487a
commit 29fb038
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ TruffleRuby is actively tested on the following systems:
 * Ubuntu 16.04, 18.04, 20.04, 22.04 (all LTS)
 * Fedora 37, 38
 * Debian 10, 11, 12
-* macOS 10.14 (Mojave) for amd64, 11 (Big Sur) for aarch64
+* macOS 11 (Big Sur)
 
 Architectures:
 

diff --git a/ci.jsonnet b/ci.jsonnet
@@ -251,7 +251,7 @@ local part_definitions = {
       platform_name:: "DarwinAMD64",
       "$.cap":: {
         # GR-45839, GR-46279: exclude macmini_late_2014_8gb, they are too slow, have too little RAM and cause various timeouts
-        normal_machine: ["darwin_mojave", "!macmini_late_2014_8gb"],
+        normal_machine: ["darwin_bigsur", "!macmini_late_2014_8gb"],
       },
       environment+: {
         LANG: "en_US.UTF-8",
@@ -521,7 +521,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       "ruby-test-specs-linux-amd64-stable":    $.platform.linux  + $.jdk.stable + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
       "ruby-test-specs-linux-amd64-latest":    $.platform.linux  + $.jdk.latest + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
       "ruby-test-specs-darwin-amd64-stable":   $.platform.darwin_amd64 + $.jdk.stable + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
-      # "ruby-test-specs-darwin-amd64-latest":   $.platform.darwin_amd64 + $.jdk.latest + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" }, # GR-49652
+      "ruby-test-specs-darwin-amd64-latest":   $.platform.darwin_amd64 + $.jdk.latest + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
       "ruby-test-specs-darwin-aarch64-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
       "ruby-test-specs-darwin-aarch64-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
       "ruby-test-fast-linux-aarch64":   $.platform.linux_aarch64 + $.jdk.stable + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
@@ -551,7 +551,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       "ruby-test-svm-ce-linux-amd64-stable":    $.platform.linux          + $.jdk.stable + $.env.native    + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
       "ruby-test-svm-ce-linux-amd64-latest":    $.platform.linux          + $.jdk.latest + $.env.native    + $.env.gdb_svm + gate + native_tests,
       "ruby-test-svm-ce-darwin-amd64-stable":   $.platform.darwin_amd64   + $.jdk.stable + $.env.native    + $.env.gdb_svm + gate + native_tests,
-      # "ruby-test-svm-ce-darwin-amd64-latest":   $.platform.darwin_amd64   + $.jdk.latest + $.env.native    + $.env.gdb_svm + gate + native_tests, # GR-49652
+      "ruby-test-svm-ce-darwin-amd64-latest":   $.platform.darwin_amd64   + $.jdk.latest + $.env.native    + $.env.gdb_svm + gate + native_tests,
       "ruby-test-svm-ce-darwin-aarch64-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native    +                 gate + native_tests,
       "ruby-test-svm-ce-darwin-aarch64-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native    +                 gate + native_tests,
       "ruby-test-svm-ee-linux-amd64":    $.platform.linux          + $.jdk.stable + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },

diff --git a/lib/cext/include/truffleruby/config_darwin_amd64.h b/lib/cext/include/truffleruby/config_darwin_amd64.h
@@ -76,8 +76,6 @@
 #if defined(__x86_64__)
 #define HAVE_X86INTRIN_H 1
 #endif
-#define HAVE_GMP_H 1
-#define HAVE_LIBGMP 1
 #define HAVE_TYPEOF 1
 #define restrict __restrict__
 #define HAVE_LONG_LONG 1
@@ -433,7 +431,7 @@
 #define SET_CURRENT_THREAD_NAME(name) pthread_setname_np(name)
 #define DEFINE_MCONTEXT_PTR(mc, uc) mcontext_t mc = (uc)->uc_mcontext
 #define HAVE_SYS_USER_H 1
-#define HAVE_CONST_PAGE_SIZE 1
+#define HAVE_CONST_PAGE_SIZE 0
 #define IOCTL_REQ_TYPE unsigned long
 #define NUM2IOCTLREQ(num) NUM2ULONG(num)
 #define HAVE_MACH_O_LOADER_H 1
@@ -455,5 +453,5 @@
 #define RUBY_JMP_BUF sigjmp_buf
 #define USE_MJIT 1
 #define USE_YJIT 0
-#define RUBY_PLATFORM "x86_64-darwin18"
+#define RUBY_PLATFORM "x86_64-darwin20"
 #endif /* INCLUDE_RUBY_CONFIG_H */
diff --git a/lib/cext/include/truffleruby/truffleruby-abi-version.h b/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.9"
 
 #endif
diff --git a/src/main/java/org/truffleruby/platform/DarwinAArch64NativeConfiguration.java b/src/main/java/org/truffleruby/platform/DarwinAArch64NativeConfiguration.java
@@ -42,7 +42,7 @@
 public final class DarwinAArch64NativeConfiguration extends DefaultNativeConfiguration {
 
     public static void load(NativeConfiguration configuration, RubyContext context) {
-        // Generated from tool/generate-native-config.rb on arm64-darwin20
+        // Generated from tool/generate-native-config.rb on arm64-darwin
         configuration.config("platform.sigaction.sizeof", 16);
         configuration.config("platform.sigaction.sa_handler.offset", 0);
         configuration.config("platform.sigaction.sa_handler.size", 8);

diff --git a/src/main/java/org/truffleruby/platform/DarwinAMD64NativeConfiguration.java b/src/main/java/org/truffleruby/platform/DarwinAMD64NativeConfiguration.java
@@ -42,7 +42,7 @@
 public final class DarwinAMD64NativeConfiguration extends DefaultNativeConfiguration {
 
     public static void load(NativeConfiguration configuration, RubyContext context) {
-        // Generated from tool/generate-native-config.rb on x86_64-darwin18
+        // Generated from tool/generate-native-config.rb on x86_64-darwin
         configuration.config("platform.sigaction.sizeof", 16);
         configuration.config("platform.sigaction.sa_handler.offset", 0);
         configuration.config("platform.sigaction.sa_handler.size", 8);
@@ -425,8 +425,8 @@ public static void load(NativeConfiguration configuration, RubyContext context)
         configuration.config("platform.socket.PF_ISDN", 28);
         configuration.config("platform.socket.AF_LOCAL", 1);
         configuration.config("platform.socket.PF_LOCAL", 1);
-        configuration.config("platform.socket.AF_MAX", 40);
-        configuration.config("platform.socket.PF_MAX", 40);
+        configuration.config("platform.socket.AF_MAX", 41);
+        configuration.config("platform.socket.PF_MAX", 41);
         configuration.config("platform.socket.AF_ROUTE", 17);
         configuration.config("platform.socket.PF_ROUTE", 17);
         configuration.config("platform.socket.AF_SNA", 11);
@@ -544,6 +544,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
         configuration.config("platform.socket.MSG_DONTROUTE", 4);
         configuration.config("platform.socket.MSG_DONTWAIT", 128);
         configuration.config("platform.socket.MSG_EOR", 8);
+        configuration.config("platform.socket.MSG_NOSIGNAL", 524288);
         configuration.config("platform.socket.MSG_OOB", 1);
         configuration.config("platform.socket.MSG_PEEK", 2);
         configuration.config("platform.socket.MSG_TRUNC", 16);

diff --git a/tool/generate-config-header.sh b/tool/generate-config-header.sh
@@ -33,6 +33,7 @@ if [ ! -d "ruby-$VERSION" ]; then
 fi
 
 cd "ruby-$VERSION" || exit 1
-./configure || (cat config.log; exit 1)
+# Disable GMP as it might not be available on the runtime machine and we do not use it
+./configure --without-gmp || (cat config.log; exit 1)
 
 cp .ext/include/*/ruby/config.h "../lib/cext/include/truffleruby/config_${mx_platform}.h"
diff --git a/tool/generate-native-config.rb b/tool/generate-native-config.rb
@@ -85,7 +85,7 @@ def initialize
 
     @file = File.open(java_file, 'wb')
     @file.puts contents[0...from+METHOD_START.length]
-    @file.puts "#{INDENT}// Generated from #{SCRIPT} on #{RUBY_PLATFORM}"
+    @file.puts "#{INDENT}// Generated from #{SCRIPT} on #{RUBY_PLATFORM.sub(/darwin\d+/, 'darwin')}"
     at_exit do
       @file.puts contents[to..-1]
       @file.close