Skip to content

Commit 9b2cc0b

Browse files
committed
[GR-44714] Move darwin-amd64 CI from Mojave to Big Sur
1 parent 896c61f commit 9b2cc0b

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TruffleRuby is actively tested on the following systems:
9090
* Ubuntu 16.04, 18.04, 20.04, 22.04 (all LTS)
9191
* Fedora 37, 38
9292
* Debian 10, 11, 12
93-
* macOS 10.14 (Mojave) for amd64, 11 (Big Sur) for aarch64
93+
* macOS 11 (Big Sur)
9494

9595
Architectures:
9696

ci.jsonnet

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ local part_definitions = {
251251
platform_name:: "DarwinAMD64",
252252
"$.cap":: {
253253
# GR-45839, GR-46279: exclude macmini_late_2014_8gb, they are too slow, have too little RAM and cause various timeouts
254-
normal_machine: ["darwin_mojave", "!macmini_late_2014_8gb"],
254+
normal_machine: ["darwin_bigsur", "!macmini_late_2014_8gb"],
255255
},
256256
environment+: {
257257
LANG: "en_US.UTF-8",
@@ -521,7 +521,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
521521
"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" },
522522
"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" },
523523
"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" },
524-
# "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
524+
"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" },
525525
"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" },
526526
"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" },
527527
"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, "
551551
"ruby-test-svm-ce-linux-amd64-stable": $.platform.linux + $.jdk.stable + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
552552
"ruby-test-svm-ce-linux-amd64-latest": $.platform.linux + $.jdk.latest + $.env.native + $.env.gdb_svm + gate + native_tests,
553553
"ruby-test-svm-ce-darwin-amd64-stable": $.platform.darwin_amd64 + $.jdk.stable + $.env.native + $.env.gdb_svm + gate + native_tests,
554-
# "ruby-test-svm-ce-darwin-amd64-latest": $.platform.darwin_amd64 + $.jdk.latest + $.env.native + $.env.gdb_svm + gate + native_tests, # GR-49652
554+
"ruby-test-svm-ce-darwin-amd64-latest": $.platform.darwin_amd64 + $.jdk.latest + $.env.native + $.env.gdb_svm + gate + native_tests,
555555
"ruby-test-svm-ce-darwin-aarch64-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native + gate + native_tests,
556556
"ruby-test-svm-ce-darwin-aarch64-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native + gate + native_tests,
557557
"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" },

lib/cext/include/truffleruby/config_darwin_amd64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
#define SET_CURRENT_THREAD_NAME(name) pthread_setname_np(name)
434434
#define DEFINE_MCONTEXT_PTR(mc, uc) mcontext_t mc = (uc)->uc_mcontext
435435
#define HAVE_SYS_USER_H 1
436-
#define HAVE_CONST_PAGE_SIZE 1
436+
#define HAVE_CONST_PAGE_SIZE 0
437437
#define IOCTL_REQ_TYPE unsigned long
438438
#define NUM2IOCTLREQ(num) NUM2ULONG(num)
439439
#define HAVE_MACH_O_LOADER_H 1
@@ -455,5 +455,5 @@
455455
#define RUBY_JMP_BUF sigjmp_buf
456456
#define USE_MJIT 1
457457
#define USE_YJIT 0
458-
#define RUBY_PLATFORM "x86_64-darwin18"
458+
#define RUBY_PLATFORM "x86_64-darwin20"
459459
#endif /* INCLUDE_RUBY_CONFIG_H */

src/main/java/org/truffleruby/platform/DarwinAMD64NativeConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ public static void load(NativeConfiguration configuration, RubyContext context)
425425
configuration.config("platform.socket.PF_ISDN", 28);
426426
configuration.config("platform.socket.AF_LOCAL", 1);
427427
configuration.config("platform.socket.PF_LOCAL", 1);
428-
configuration.config("platform.socket.AF_MAX", 40);
429-
configuration.config("platform.socket.PF_MAX", 40);
428+
configuration.config("platform.socket.AF_MAX", 41);
429+
configuration.config("platform.socket.PF_MAX", 41);
430430
configuration.config("platform.socket.AF_ROUTE", 17);
431431
configuration.config("platform.socket.PF_ROUTE", 17);
432432
configuration.config("platform.socket.AF_SNA", 11);
@@ -544,6 +544,7 @@ public static void load(NativeConfiguration configuration, RubyContext context)
544544
configuration.config("platform.socket.MSG_DONTROUTE", 4);
545545
configuration.config("platform.socket.MSG_DONTWAIT", 128);
546546
configuration.config("platform.socket.MSG_EOR", 8);
547+
configuration.config("platform.socket.MSG_NOSIGNAL", 524288);
547548
configuration.config("platform.socket.MSG_OOB", 1);
548549
configuration.config("platform.socket.MSG_PEEK", 2);
549550
configuration.config("platform.socket.MSG_TRUNC", 16);

0 commit comments

Comments
 (0)