From 34fee107af341c75bee035b6921959201f5fc589 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 15:28:44 +0200
Subject: [PATCH 1/8] Avoid macos-latest, rename workflows to macos-intel

---
 .github/workflows/{macosx-500.yml => macosx-intel-500.yml}    | 4 ++--
 .github/workflows/{macosx-51x.yml => macosx-intel-51x.yml}    | 4 ++--
 .github/workflows/{macosx-520.yml => macosx-intel-520.yml}    | 4 ++--
 .../{macosx-530-trunk.yml => macosx-intel-530-trunk.yml}      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename .github/workflows/{macosx-500.yml => macosx-intel-500.yml} (77%)
 rename .github/workflows/{macosx-51x.yml => macosx-intel-51x.yml} (81%)
 rename .github/workflows/{macosx-520.yml => macosx-intel-520.yml} (80%)
 rename .github/workflows/{macosx-530-trunk.yml => macosx-intel-530-trunk.yml} (82%)

diff --git a/.github/workflows/macosx-500.yml b/.github/workflows/macosx-intel-500.yml
similarity index 77%
rename from .github/workflows/macosx-500.yml
rename to .github/workflows/macosx-intel-500.yml
index 564c50ac..5adee673 100644
--- a/.github/workflows/macosx-500.yml
+++ b/.github/workflows/macosx-intel-500.yml
@@ -1,4 +1,4 @@
-name: macOS 5.0.0
+name: macOS-intel 5.0.0
 
 on:
   schedule:
@@ -10,4 +10,4 @@ jobs:
   build:
     uses: ./.github/workflows/common.yml
     with:
-      runs_on: 'macos-latest'
+      runs_on: 'macos-13'
diff --git a/.github/workflows/macosx-51x.yml b/.github/workflows/macosx-intel-51x.yml
similarity index 81%
rename from .github/workflows/macosx-51x.yml
rename to .github/workflows/macosx-intel-51x.yml
index dec10c5e..286cfea4 100644
--- a/.github/workflows/macosx-51x.yml
+++ b/.github/workflows/macosx-intel-51x.yml
@@ -1,4 +1,4 @@
-name: macOS 5.1
+name: macOS-intel 5.1
 
 on:
   schedule:
@@ -11,4 +11,4 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-base-compiler.5.1.1'
-      runs_on: 'macos-latest'
+      runs_on: 'macos-13'
diff --git a/.github/workflows/macosx-520.yml b/.github/workflows/macosx-intel-520.yml
similarity index 80%
rename from .github/workflows/macosx-520.yml
rename to .github/workflows/macosx-intel-520.yml
index e6f10e8c..26a639bf 100644
--- a/.github/workflows/macosx-520.yml
+++ b/.github/workflows/macosx-intel-520.yml
@@ -1,4 +1,4 @@
-name: macOS 5.2
+name: macOS-intel 5.2
 
 on:
   pull_request:
@@ -12,4 +12,4 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-base-compiler.5.2.0~beta2'
-      runs_on: 'macos-latest'
+      runs_on: 'macos-13'
diff --git a/.github/workflows/macosx-530-trunk.yml b/.github/workflows/macosx-intel-530-trunk.yml
similarity index 82%
rename from .github/workflows/macosx-530-trunk.yml
rename to .github/workflows/macosx-intel-530-trunk.yml
index c8c11cc5..badd35be 100644
--- a/.github/workflows/macosx-530-trunk.yml
+++ b/.github/workflows/macosx-intel-530-trunk.yml
@@ -1,4 +1,4 @@
-name: macOS trunk
+name: macOS-intel trunk
 
 on:
   pull_request:
@@ -13,4 +13,4 @@ jobs:
     with:
       compiler: 'ocaml-variants.5.3.0+trunk'
       compiler_git_ref: refs/heads/trunk
-      runs_on: 'macos-latest'
+      runs_on: 'macos-13'

From 37bf3a81135f263846cb780ad94af052360e11c3 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 15:30:42 +0200
Subject: [PATCH 2/8] Update README with new intel workflow names

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2a703862..1d5079bd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Multicore tests
 [![OPAM installation](https://github.com/ocaml-multicore/multicoretests/actions/workflows/opam.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/opam.yml)
 
 [![Linux 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500.yml)
-[![MacOSX 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-500.yml)
+[![MacOSX 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml)
 [![Linux 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml)
 [![Linux 5.0.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml)
 [![Linux 32-bit 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml)
@@ -12,7 +12,7 @@ Multicore tests
 [![MinGW 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500-bytecode.yml)
 
 [![Linux 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x.yml)
-[![MacOSX 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-51x.yml)
+[![MacOSX 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml)
 [![Linux 5.1.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml)
 [![Linux 5.1.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml)
 [![Linux 32-bit 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml)
@@ -22,7 +22,7 @@ Multicore tests
 [![Cygwin 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-51x.yml)
 
 [![Linux 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520.yml)
-[![MacOSX 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-520.yml)
+[![MacOSX 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml)
 [![Linux 5.2.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml)
 [![Linux 5.2.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml)
 [![Linux 32-bit 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml)
@@ -32,7 +32,7 @@ Multicore tests
 [![Cygwin 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-520.yml)
 
 [![Linux 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk.yml)
-[![MacOSX 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-530-trunk.yml)
+[![MacOSX 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml)
 [![Linux 5.3.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml)
 [![Linux 5.3.0+trunk-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml)
 [![Linux 32-bit 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml)

From 034b0e69bdf6d03bd0c5d3735c5f5d5e1d15711c Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 15:37:27 +0200
Subject: [PATCH 3/8] Add explicit macOS ARM64/M1 workflows

---
 .github/workflows/macosx-arm64-500.yml       | 13 +++++++++++++
 .github/workflows/macosx-arm64-51x.yml       | 14 ++++++++++++++
 .github/workflows/macosx-arm64-520.yml       | 15 +++++++++++++++
 .github/workflows/macosx-arm64-530-trunk.yml | 16 ++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 .github/workflows/macosx-arm64-500.yml
 create mode 100644 .github/workflows/macosx-arm64-51x.yml
 create mode 100644 .github/workflows/macosx-arm64-520.yml
 create mode 100644 .github/workflows/macosx-arm64-530-trunk.yml

diff --git a/.github/workflows/macosx-arm64-500.yml b/.github/workflows/macosx-arm64-500.yml
new file mode 100644
index 00000000..6202766c
--- /dev/null
+++ b/.github/workflows/macosx-arm64-500.yml
@@ -0,0 +1,13 @@
+name: macOS-ARM64 5.0.0
+
+on:
+  schedule:
+    # Every Sunday morning, at 1:11 UTC
+    - cron: '11 1 * * 0'
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      runs_on: 'macos-14'
diff --git a/.github/workflows/macosx-arm64-51x.yml b/.github/workflows/macosx-arm64-51x.yml
new file mode 100644
index 00000000..bfe137c7
--- /dev/null
+++ b/.github/workflows/macosx-arm64-51x.yml
@@ -0,0 +1,14 @@
+name: macOS-ARM64 5.1
+
+on:
+  schedule:
+    # Every Sunday morning, at 2:22 UTC
+    - cron: '22 2 * * 0'
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-base-compiler.5.1.1'
+      runs_on: 'macos-14'
diff --git a/.github/workflows/macosx-arm64-520.yml b/.github/workflows/macosx-arm64-520.yml
new file mode 100644
index 00000000..619af02b
--- /dev/null
+++ b/.github/workflows/macosx-arm64-520.yml
@@ -0,0 +1,15 @@
+name: macOS-ARM64 5.2
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-base-compiler.5.2.0~beta2'
+      runs_on: 'macos-14'
diff --git a/.github/workflows/macosx-arm64-530-trunk.yml b/.github/workflows/macosx-arm64-530-trunk.yml
new file mode 100644
index 00000000..8a5bac99
--- /dev/null
+++ b/.github/workflows/macosx-arm64-530-trunk.yml
@@ -0,0 +1,16 @@
+name: macOS-ARM64 trunk
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-variants.5.3.0+trunk'
+      compiler_git_ref: refs/heads/trunk
+      runs_on: 'macos-14'

From d7783c701c2f57a0e5a53007ac82dc0c82123fe6 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 15:44:21 +0200
Subject: [PATCH 4/8] Update README with macOS ARM64 badges

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 1d5079bd..38b6686d 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Multicore tests
 
 [![Linux 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500.yml)
 [![MacOSX 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml)
+[![MacOSX 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml)
 [![Linux 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml)
 [![Linux 5.0.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml)
 [![Linux 32-bit 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml)
@@ -13,6 +14,7 @@ Multicore tests
 
 [![Linux 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x.yml)
 [![MacOSX 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml)
+[![MacOSX 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml)
 [![Linux 5.1.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml)
 [![Linux 5.1.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml)
 [![Linux 32-bit 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml)
@@ -23,6 +25,7 @@ Multicore tests
 
 [![Linux 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520.yml)
 [![MacOSX 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml)
+[![MacOSX 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml)
 [![Linux 5.2.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml)
 [![Linux 5.2.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml)
 [![Linux 32-bit 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml)
@@ -33,6 +36,7 @@ Multicore tests
 
 [![Linux 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk.yml)
 [![MacOSX 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml)
+[![MacOSX 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml)
 [![Linux 5.3.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml)
 [![Linux 5.3.0+trunk-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml)
 [![Linux 32-bit 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml)

From 77ebc5698ac82f7ac61a5a4382a829a53692942a Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 15:49:48 +0200
Subject: [PATCH 5/8] Update macOS README link texts

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 38b6686d..9919c32e 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ Multicore tests
 [![OPAM installation](https://github.com/ocaml-multicore/multicoretests/actions/workflows/opam.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/opam.yml)
 
 [![Linux 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500.yml)
-[![MacOSX 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml)
-[![MacOSX 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml)
+[![macOS-Intel 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-500.yml)
+[![macOS-ARM64 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-500.yml)
 [![Linux 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-bytecode.yml)
 [![Linux 5.0.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-debug.yml)
 [![Linux 32-bit 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-500-32bit.yml)
@@ -13,8 +13,8 @@ Multicore tests
 [![MinGW 5.0.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500-bytecode.yml)
 
 [![Linux 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x.yml)
-[![MacOSX 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml)
-[![MacOSX 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml)
+[![macOS-Intel 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-51x.yml)
+[![macOS-ARM64 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-51x.yml)
 [![Linux 5.1.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-bytecode.yml)
 [![Linux 5.1.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-debug.yml)
 [![Linux 32-bit 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-51x-32bit.yml)
@@ -24,8 +24,8 @@ Multicore tests
 [![Cygwin 5.1.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-51x.yml)
 
 [![Linux 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520.yml)
-[![MacOSX 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml)
-[![MacOSX 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml)
+[![macOS-Intel 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-520.yml)
+[![macOS-ARM64 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-520.yml)
 [![Linux 5.2.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-bytecode.yml)
 [![Linux 5.2.0-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-debug.yml)
 [![Linux 32-bit 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-32bit.yml)
@@ -35,8 +35,8 @@ Multicore tests
 [![Cygwin 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-520.yml)
 
 [![Linux 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk.yml)
-[![MacOSX 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml)
-[![MacOSX 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml)
+[![macOS-Intel 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-intel-530-trunk.yml)
+[![macOS-ARM64 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-arm64-530-trunk.yml)
 [![Linux 5.3.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-bytecode.yml)
 [![Linux 5.3.0+trunk-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-debug.yml)
 [![Linux 32-bit 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-32bit.yml)

From f75289c5a775bdb9eef37ba10785c3f877e713fa Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 16:41:14 +0200
Subject: [PATCH 6/8] Make parallel Sys STM test negative on macOS ARM64

---
 src/sys/stm_tests.ml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/sys/stm_tests.ml b/src/sys/stm_tests.ml
index 0ae67ad8..fd079931 100644
--- a/src/sys/stm_tests.ml
+++ b/src/sys/stm_tests.ml
@@ -322,15 +322,13 @@ let run_cmd cmd =
 
 let uname_os () = run_cmd "uname -s"
 
-let arch () = run_cmd "opam var arch"
-
 module Sys_seq = STM_sequential.Make(SConf)
 module Sys_dom = STM_domain.Make(SConf)
 
 ;;
 QCheck_base_runner.run_tests_main [
     Sys_seq.agree_test              ~count:1000 ~name:"STM Sys test sequential";
-    if Sys.unix && (uname_os () = Some "Linux" || arch () = Some "arm64")
+    if Sys.unix && uname_os () = Some "Linux"
     then Sys_dom.agree_test_par     ~count:200  ~name:"STM Sys test parallel"
     else Sys_dom.neg_agree_test_par ~count:1000 ~name:"STM Sys test parallel"
   ]

From 4fda9c22060faf02275d5f3486ae31f8460137fc Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Thu, 16 May 2024 16:43:59 +0200
Subject: [PATCH 7/8] Update opam workflows to 5.2.0 release and trunk being
 5.3.0

---
 .github/workflows/opam.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
index 90922403..ded1b47c 100644
--- a/.github/workflows/opam.yml
+++ b/.github/workflows/opam.yml
@@ -24,7 +24,8 @@ jobs:
           - 4.14.x
           - 5.0.0
           - 5.1.0
-          - ocaml-variants.5.2.0+trunk
+          - 5.2.0
+          - ocaml-variants.5.3.0+trunk
 
     runs-on: ubuntu-latest
 

From adff14c5ec099a22a0fbe363797e14d97b700c26 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Fri, 17 May 2024 11:32:18 +0200
Subject: [PATCH 8/8] Bump STM Sys test parallel count to 2500

---
 src/sys/stm_tests.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sys/stm_tests.ml b/src/sys/stm_tests.ml
index fd079931..8738a11e 100644
--- a/src/sys/stm_tests.ml
+++ b/src/sys/stm_tests.ml
@@ -330,5 +330,5 @@ QCheck_base_runner.run_tests_main [
     Sys_seq.agree_test              ~count:1000 ~name:"STM Sys test sequential";
     if Sys.unix && uname_os () = Some "Linux"
     then Sys_dom.agree_test_par     ~count:200  ~name:"STM Sys test parallel"
-    else Sys_dom.neg_agree_test_par ~count:1000 ~name:"STM Sys test parallel"
+    else Sys_dom.neg_agree_test_par ~count:2500 ~name:"STM Sys test parallel"
   ]