From a9ed2e1a63a59981a1b724617678685217add507 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 16:40:14 +0100
Subject: [PATCH 01/17] Add Linux 5.3.0+trunk workflows

---
 .github/workflows/linux-530-trunk-32bit.yml    | 11 +++++++++++
 .github/workflows/linux-530-trunk-bytecode.yml | 11 +++++++++++
 .github/workflows/linux-530-trunk-debug.yml    | 13 +++++++++++++
 .github/workflows/linux-530-trunk-fp.yml       | 11 +++++++++++
 .github/workflows/linux-530-trunk.yml          | 10 ++++++++++
 5 files changed, 56 insertions(+)
 create mode 100644 .github/workflows/linux-530-trunk-32bit.yml
 create mode 100644 .github/workflows/linux-530-trunk-bytecode.yml
 create mode 100644 .github/workflows/linux-530-trunk-debug.yml
 create mode 100644 .github/workflows/linux-530-trunk-fp.yml
 create mode 100644 .github/workflows/linux-530-trunk.yml

diff --git a/.github/workflows/linux-530-trunk-32bit.yml b/.github/workflows/linux-530-trunk-32bit.yml
new file mode 100644
index 00000000..e59e5a51
--- /dev/null
+++ b/.github/workflows/linux-530-trunk-32bit.yml
@@ -0,0 +1,11 @@
+name: 32bit trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-variants.5.3.0+trunk,ocaml-option-32bit'
+      compiler_git_ref: refs/heads/trunk
+      timeout: 240
diff --git a/.github/workflows/linux-530-trunk-bytecode.yml b/.github/workflows/linux-530-trunk-bytecode.yml
new file mode 100644
index 00000000..ae05a019
--- /dev/null
+++ b/.github/workflows/linux-530-trunk-bytecode.yml
@@ -0,0 +1,11 @@
+name: Bytecode trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-variants.5.3.0+trunk,ocaml-option-bytecode-only'
+      compiler_git_ref: refs/heads/trunk
+      timeout: 240
diff --git a/.github/workflows/linux-530-trunk-debug.yml b/.github/workflows/linux-530-trunk-debug.yml
new file mode 100644
index 00000000..aa3cebf6
--- /dev/null
+++ b/.github/workflows/linux-530-trunk-debug.yml
@@ -0,0 +1,13 @@
+name: Linux trunk debug
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-variants.5.3.0+trunk'
+      compiler_git_ref: refs/heads/trunk
+      dune_profile: 'debug-runtime'
+      runparam: 's=4096,v=0,V=1'
+      timeout: 240
diff --git a/.github/workflows/linux-530-trunk-fp.yml b/.github/workflows/linux-530-trunk-fp.yml
new file mode 100644
index 00000000..769c9740
--- /dev/null
+++ b/.github/workflows/linux-530-trunk-fp.yml
@@ -0,0 +1,11 @@
+name: FP trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-variants.5.3.0+trunk,ocaml-option-fp'
+      compiler_git_ref: refs/heads/trunk
+      timeout: 240
diff --git a/.github/workflows/linux-530-trunk.yml b/.github/workflows/linux-530-trunk.yml
new file mode 100644
index 00000000..2d969623
--- /dev/null
+++ b/.github/workflows/linux-530-trunk.yml
@@ -0,0 +1,10 @@
+name: Linux trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      compiler: 'ocaml-variants.5.3.0+trunk'
+      compiler_git_ref: refs/heads/trunk

From 18251d25552fe6ce0d7c688f2dbf13fecc087441 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 16:42:28 +0100
Subject: [PATCH 02/17] Add MinGW 5.3.0+trunk workflows

---
 .github/workflows/mingw-530-trunk-bytecode.yml | 12 ++++++++++++
 .github/workflows/mingw-530-trunk.yml          | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .github/workflows/mingw-530-trunk-bytecode.yml
 create mode 100644 .github/workflows/mingw-530-trunk.yml

diff --git a/.github/workflows/mingw-530-trunk-bytecode.yml b/.github/workflows/mingw-530-trunk-bytecode.yml
new file mode 100644
index 00000000..67609ab1
--- /dev/null
+++ b/.github/workflows/mingw-530-trunk-bytecode.yml
@@ -0,0 +1,12 @@
+name: MinGW bytecode trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      runs_on: windows-latest
+      compiler: ocaml.5.3.0,ocaml-option-mingw,ocaml-option-bytecode-only
+      compiler_git_ref: refs/heads/trunk
+      timeout: 240
diff --git a/.github/workflows/mingw-530-trunk.yml b/.github/workflows/mingw-530-trunk.yml
new file mode 100644
index 00000000..1762ac8f
--- /dev/null
+++ b/.github/workflows/mingw-530-trunk.yml
@@ -0,0 +1,12 @@
+name: MinGW trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      runs_on: windows-latest
+      compiler: ocaml.5.3.0,ocaml-option-mingw
+      compiler_git_ref: refs/heads/trunk
+      timeout: 240

From 74f81fa4b4666ce7767ea0455165ce7eb596a255 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 16:44:17 +0100
Subject: [PATCH 03/17] Add macOS and Cygwin 5.3.0+trunk workflows

---
 .github/workflows/cygwin-530-trunk.yml | 13 +++++++++++++
 .github/workflows/macosx-530-trunk.yml | 11 +++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .github/workflows/cygwin-530-trunk.yml
 create mode 100644 .github/workflows/macosx-530-trunk.yml

diff --git a/.github/workflows/cygwin-530-trunk.yml b/.github/workflows/cygwin-530-trunk.yml
new file mode 100644
index 00000000..28185682
--- /dev/null
+++ b/.github/workflows/cygwin-530-trunk.yml
@@ -0,0 +1,13 @@
+name: Cygwin trunk
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/common.yml
+    with:
+      runs_on: windows-latest
+      compiler: ocaml.5.3.0
+      cygwin: true
+      compiler_git_ref: refs/heads/trunk
+      timeout: 360
diff --git a/.github/workflows/macosx-530-trunk.yml b/.github/workflows/macosx-530-trunk.yml
new file mode 100644
index 00000000..ff54fcad
--- /dev/null
+++ b/.github/workflows/macosx-530-trunk.yml
@@ -0,0 +1,11 @@
+name: macOS trunk
+
+on: [push, pull_request, 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-latest'

From bad556b01e0c3bcc8ae0c03c36d47be98cbe8121 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 16:58:40 +0100
Subject: [PATCH 04/17] Update Linux 5.2 titles and head

---
 .github/workflows/linux-520-trunk-32bit.yml    | 4 ++--
 .github/workflows/linux-520-trunk-bytecode.yml | 4 ++--
 .github/workflows/linux-520-trunk-debug.yml    | 4 ++--
 .github/workflows/linux-520-trunk-fp.yml       | 4 ++--
 .github/workflows/linux-520-trunk.yml          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/linux-520-trunk-32bit.yml b/.github/workflows/linux-520-trunk-32bit.yml
index 2cc246c7..59973ac6 100644
--- a/.github/workflows/linux-520-trunk-32bit.yml
+++ b/.github/workflows/linux-520-trunk-32bit.yml
@@ -1,4 +1,4 @@
-name: 32bit trunk
+name: 32bit 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -7,5 +7,5 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-variants.5.2.0+trunk,ocaml-option-32bit'
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       timeout: 240
diff --git a/.github/workflows/linux-520-trunk-bytecode.yml b/.github/workflows/linux-520-trunk-bytecode.yml
index b27fe771..12f9bb33 100644
--- a/.github/workflows/linux-520-trunk-bytecode.yml
+++ b/.github/workflows/linux-520-trunk-bytecode.yml
@@ -1,4 +1,4 @@
-name: Bytecode trunk
+name: Bytecode 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -7,5 +7,5 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-variants.5.2.0+trunk,ocaml-option-bytecode-only'
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       timeout: 240
diff --git a/.github/workflows/linux-520-trunk-debug.yml b/.github/workflows/linux-520-trunk-debug.yml
index e547ccf9..bc49ff3d 100644
--- a/.github/workflows/linux-520-trunk-debug.yml
+++ b/.github/workflows/linux-520-trunk-debug.yml
@@ -1,4 +1,4 @@
-name: Linux trunk debug
+name: Linux 5.2 debug
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -7,7 +7,7 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-variants.5.2.0+trunk'
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       dune_profile: 'debug-runtime'
       runparam: 's=4096,v=0,V=1'
       timeout: 240
diff --git a/.github/workflows/linux-520-trunk-fp.yml b/.github/workflows/linux-520-trunk-fp.yml
index 5821101d..1f13d122 100644
--- a/.github/workflows/linux-520-trunk-fp.yml
+++ b/.github/workflows/linux-520-trunk-fp.yml
@@ -1,4 +1,4 @@
-name: FP trunk
+name: FP 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -7,5 +7,5 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-variants.5.2.0+trunk,ocaml-option-fp'
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       timeout: 240
diff --git a/.github/workflows/linux-520-trunk.yml b/.github/workflows/linux-520-trunk.yml
index e9a3add6..eb362328 100644
--- a/.github/workflows/linux-520-trunk.yml
+++ b/.github/workflows/linux-520-trunk.yml
@@ -1,4 +1,4 @@
-name: Linux trunk
+name: Linux 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -7,4 +7,4 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-variants.5.2.0+trunk'
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2

From 054f662f24e05e90a0c811efa868987bec2e38c4 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:00:21 +0100
Subject: [PATCH 05/17] Update MinGW 5.2 titles and head

---
 .github/workflows/mingw-520-trunk-bytecode.yml | 4 ++--
 .github/workflows/mingw-520-trunk.yml          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mingw-520-trunk-bytecode.yml b/.github/workflows/mingw-520-trunk-bytecode.yml
index 576211b9..e96787b3 100644
--- a/.github/workflows/mingw-520-trunk-bytecode.yml
+++ b/.github/workflows/mingw-520-trunk-bytecode.yml
@@ -1,4 +1,4 @@
-name: MinGW bytecode trunk
+name: MinGW bytecode 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -8,5 +8,5 @@ jobs:
     with:
       runs_on: windows-latest
       compiler: ocaml.5.2.0,ocaml-option-mingw,ocaml-option-bytecode-only
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       timeout: 240
diff --git a/.github/workflows/mingw-520-trunk.yml b/.github/workflows/mingw-520-trunk.yml
index c9604482..692bb8e1 100644
--- a/.github/workflows/mingw-520-trunk.yml
+++ b/.github/workflows/mingw-520-trunk.yml
@@ -1,4 +1,4 @@
-name: MinGW trunk
+name: MinGW 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -8,5 +8,5 @@ jobs:
     with:
       runs_on: windows-latest
       compiler: ocaml.5.2.0,ocaml-option-mingw
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       timeout: 240

From 841bfc5febc5bb925186019eab6134ea82280ad6 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:02:58 +0100
Subject: [PATCH 06/17] Update macOS and Cygwin 5.2 titles and head

---
 .github/workflows/cygwin-520-trunk.yml | 4 ++--
 .github/workflows/macosx-520-trunk.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cygwin-520-trunk.yml b/.github/workflows/cygwin-520-trunk.yml
index 3fe1e9b1..94f222a1 100644
--- a/.github/workflows/cygwin-520-trunk.yml
+++ b/.github/workflows/cygwin-520-trunk.yml
@@ -1,4 +1,4 @@
-name: Cygwin trunk
+name: Cygwin 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -9,5 +9,5 @@ jobs:
       runs_on: windows-latest
       compiler: ocaml.5.2.0
       cygwin: true
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       timeout: 360
diff --git a/.github/workflows/macosx-520-trunk.yml b/.github/workflows/macosx-520-trunk.yml
index 415edc06..26d68edb 100644
--- a/.github/workflows/macosx-520-trunk.yml
+++ b/.github/workflows/macosx-520-trunk.yml
@@ -1,4 +1,4 @@
-name: macOS trunk
+name: macOS 5.2
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -7,5 +7,5 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       compiler: 'ocaml-variants.5.2.0+trunk'
-      compiler_git_ref: refs/heads/trunk
+      compiler_git_ref: refs/heads/5.2
       runs_on: 'macos-latest'

From f8cc1061b671ace82688a51a304946d611b0bd0c Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:05:20 +0100
Subject: [PATCH 07/17] Add 5.3.0+trunk badges

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

diff --git a/README.md b/README.md
index a3c3242d..ebc0b07b 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,16 @@ Multicore tests
 [![MinGW 5.2.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520-trunk-bytecode.yml)
 [![Cygwin 5.2.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-520-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-520-trunk.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)
+[![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)
+[![Linux FP 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-530-trunk-fp.yml)
+[![MinGW 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-530-trunk.yml)
+[![MinGW 5.3.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-530-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-530-trunk-bytecode.yml)
+[![Cygwin 5.3.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-530-trunk.yml)
+
 Property-based tests of (parts of) the OCaml multicore compiler and run time.
 
 This project contains

From d598207ed1d228aefbbe771b6ee2c8266ec3a091 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:18:30 +0100
Subject: [PATCH 08/17] Update Linux 5.3.0 workflows to avoid double runs

---
 .github/workflows/linux-530-trunk-32bit.yml    | 7 ++++++-
 .github/workflows/linux-530-trunk-bytecode.yml | 7 ++++++-
 .github/workflows/linux-530-trunk-debug.yml    | 7 ++++++-
 .github/workflows/linux-530-trunk-fp.yml       | 7 ++++++-
 .github/workflows/linux-530-trunk.yml          | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux-530-trunk-32bit.yml b/.github/workflows/linux-530-trunk-32bit.yml
index e59e5a51..76134487 100644
--- a/.github/workflows/linux-530-trunk-32bit.yml
+++ b/.github/workflows/linux-530-trunk-32bit.yml
@@ -1,6 +1,11 @@
 name: 32bit trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-530-trunk-bytecode.yml b/.github/workflows/linux-530-trunk-bytecode.yml
index ae05a019..41bf6c51 100644
--- a/.github/workflows/linux-530-trunk-bytecode.yml
+++ b/.github/workflows/linux-530-trunk-bytecode.yml
@@ -1,6 +1,11 @@
 name: Bytecode trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-530-trunk-debug.yml b/.github/workflows/linux-530-trunk-debug.yml
index aa3cebf6..e48a7d7e 100644
--- a/.github/workflows/linux-530-trunk-debug.yml
+++ b/.github/workflows/linux-530-trunk-debug.yml
@@ -1,6 +1,11 @@
 name: Linux trunk debug
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-530-trunk-fp.yml b/.github/workflows/linux-530-trunk-fp.yml
index 769c9740..bdf1a9e9 100644
--- a/.github/workflows/linux-530-trunk-fp.yml
+++ b/.github/workflows/linux-530-trunk-fp.yml
@@ -1,6 +1,11 @@
 name: FP trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-530-trunk.yml b/.github/workflows/linux-530-trunk.yml
index 2d969623..a53c412f 100644
--- a/.github/workflows/linux-530-trunk.yml
+++ b/.github/workflows/linux-530-trunk.yml
@@ -1,6 +1,11 @@
 name: Linux trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From f8897d0d04bc43c82566ce1491484096566c4c85 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:19:40 +0100
Subject: [PATCH 09/17] Update MinGW 5.3.0 workflows to avoid double runs

---
 .github/workflows/mingw-530-trunk-bytecode.yml | 7 ++++++-
 .github/workflows/mingw-530-trunk.yml          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mingw-530-trunk-bytecode.yml b/.github/workflows/mingw-530-trunk-bytecode.yml
index 67609ab1..a4c1b641 100644
--- a/.github/workflows/mingw-530-trunk-bytecode.yml
+++ b/.github/workflows/mingw-530-trunk-bytecode.yml
@@ -1,6 +1,11 @@
 name: MinGW bytecode trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/mingw-530-trunk.yml b/.github/workflows/mingw-530-trunk.yml
index 1762ac8f..14e2c17f 100644
--- a/.github/workflows/mingw-530-trunk.yml
+++ b/.github/workflows/mingw-530-trunk.yml
@@ -1,6 +1,11 @@
 name: MinGW trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From 453327e2d465d57e1bbeb039530612aad55580b6 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:21:16 +0100
Subject: [PATCH 10/17] Update macOS and Cygwin 5.3.0 workflows to avoid double
 runs

---
 .github/workflows/cygwin-530-trunk.yml | 7 ++++++-
 .github/workflows/macosx-530-trunk.yml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cygwin-530-trunk.yml b/.github/workflows/cygwin-530-trunk.yml
index 28185682..edb839a7 100644
--- a/.github/workflows/cygwin-530-trunk.yml
+++ b/.github/workflows/cygwin-530-trunk.yml
@@ -1,6 +1,11 @@
 name: Cygwin trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/macosx-530-trunk.yml b/.github/workflows/macosx-530-trunk.yml
index ff54fcad..c8c11cc5 100644
--- a/.github/workflows/macosx-530-trunk.yml
+++ b/.github/workflows/macosx-530-trunk.yml
@@ -1,6 +1,11 @@
 name: macOS trunk
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From 15f1f09951b263ff60ca7e7aab5a59cd261a62ea Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:24:49 +0100
Subject: [PATCH 11/17] Update Linux 5.2.0 workflows to avoid double runs

---
 .github/workflows/linux-520-trunk-32bit.yml    | 7 ++++++-
 .github/workflows/linux-520-trunk-bytecode.yml | 7 ++++++-
 .github/workflows/linux-520-trunk-debug.yml    | 7 ++++++-
 .github/workflows/linux-520-trunk-fp.yml       | 7 ++++++-
 .github/workflows/linux-520-trunk.yml          | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux-520-trunk-32bit.yml b/.github/workflows/linux-520-trunk-32bit.yml
index 59973ac6..b132888c 100644
--- a/.github/workflows/linux-520-trunk-32bit.yml
+++ b/.github/workflows/linux-520-trunk-32bit.yml
@@ -1,6 +1,11 @@
 name: 32bit 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-520-trunk-bytecode.yml b/.github/workflows/linux-520-trunk-bytecode.yml
index 12f9bb33..61cc7b1b 100644
--- a/.github/workflows/linux-520-trunk-bytecode.yml
+++ b/.github/workflows/linux-520-trunk-bytecode.yml
@@ -1,6 +1,11 @@
 name: Bytecode 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-520-trunk-debug.yml b/.github/workflows/linux-520-trunk-debug.yml
index bc49ff3d..9e36638c 100644
--- a/.github/workflows/linux-520-trunk-debug.yml
+++ b/.github/workflows/linux-520-trunk-debug.yml
@@ -1,6 +1,11 @@
 name: Linux 5.2 debug
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-520-trunk-fp.yml b/.github/workflows/linux-520-trunk-fp.yml
index 1f13d122..8f5e1c20 100644
--- a/.github/workflows/linux-520-trunk-fp.yml
+++ b/.github/workflows/linux-520-trunk-fp.yml
@@ -1,6 +1,11 @@
 name: FP 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-520-trunk.yml b/.github/workflows/linux-520-trunk.yml
index eb362328..003268cc 100644
--- a/.github/workflows/linux-520-trunk.yml
+++ b/.github/workflows/linux-520-trunk.yml
@@ -1,6 +1,11 @@
 name: Linux 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From a0313277bcd441214632248eda83536d37842b4d Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:26:41 +0100
Subject: [PATCH 12/17] Update MinGW 5.2.0 workflows to avoid double runs

---
 .github/workflows/mingw-520-trunk-bytecode.yml | 7 ++++++-
 .github/workflows/mingw-520-trunk.yml          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mingw-520-trunk-bytecode.yml b/.github/workflows/mingw-520-trunk-bytecode.yml
index e96787b3..5fb4f448 100644
--- a/.github/workflows/mingw-520-trunk-bytecode.yml
+++ b/.github/workflows/mingw-520-trunk-bytecode.yml
@@ -1,6 +1,11 @@
 name: MinGW bytecode 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/mingw-520-trunk.yml b/.github/workflows/mingw-520-trunk.yml
index 692bb8e1..0c91e4bb 100644
--- a/.github/workflows/mingw-520-trunk.yml
+++ b/.github/workflows/mingw-520-trunk.yml
@@ -1,6 +1,11 @@
 name: MinGW 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From 1ed46ca99aed13662d3da942efacdd1b8c57f22b Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:27:28 +0100
Subject: [PATCH 13/17] Update macOS and Cygwin 5.2.0 workflows to avoid double
 runs

---
 .github/workflows/cygwin-520-trunk.yml | 7 ++++++-
 .github/workflows/macosx-520-trunk.yml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cygwin-520-trunk.yml b/.github/workflows/cygwin-520-trunk.yml
index 94f222a1..a631ea7d 100644
--- a/.github/workflows/cygwin-520-trunk.yml
+++ b/.github/workflows/cygwin-520-trunk.yml
@@ -1,6 +1,11 @@
 name: Cygwin 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/macosx-520-trunk.yml b/.github/workflows/macosx-520-trunk.yml
index 26d68edb..f764f6a7 100644
--- a/.github/workflows/macosx-520-trunk.yml
+++ b/.github/workflows/macosx-520-trunk.yml
@@ -1,6 +1,11 @@
 name: macOS 5.2
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From 04711ab48ae6ec8c2fb3762c8b1577dfe2906556 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:30:19 +0100
Subject: [PATCH 14/17] Update Linux 5.1.x workflows to avoid double runs

---
 .github/workflows/linux-51x-32bit.yml    | 7 ++++++-
 .github/workflows/linux-51x-bytecode.yml | 7 ++++++-
 .github/workflows/linux-51x-debug.yml    | 7 ++++++-
 .github/workflows/linux-51x-fp.yml       | 7 ++++++-
 .github/workflows/linux-51x.yml          | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux-51x-32bit.yml b/.github/workflows/linux-51x-32bit.yml
index 8c45f38d..e0a23930 100644
--- a/.github/workflows/linux-51x-32bit.yml
+++ b/.github/workflows/linux-51x-32bit.yml
@@ -1,6 +1,11 @@
 name: 32bit 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-51x-bytecode.yml b/.github/workflows/linux-51x-bytecode.yml
index 496d149a..4f75ad56 100644
--- a/.github/workflows/linux-51x-bytecode.yml
+++ b/.github/workflows/linux-51x-bytecode.yml
@@ -1,6 +1,11 @@
 name: Bytecode 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-51x-debug.yml b/.github/workflows/linux-51x-debug.yml
index 71505db0..baebd465 100644
--- a/.github/workflows/linux-51x-debug.yml
+++ b/.github/workflows/linux-51x-debug.yml
@@ -1,6 +1,11 @@
 name: Linux 5.1 debug
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-51x-fp.yml b/.github/workflows/linux-51x-fp.yml
index d5e2489a..88da7057 100644
--- a/.github/workflows/linux-51x-fp.yml
+++ b/.github/workflows/linux-51x-fp.yml
@@ -1,6 +1,11 @@
 name: FP 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/linux-51x.yml b/.github/workflows/linux-51x.yml
index 294c9166..44ea82c0 100644
--- a/.github/workflows/linux-51x.yml
+++ b/.github/workflows/linux-51x.yml
@@ -1,6 +1,11 @@
 name: Linux 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From b75ce21566f8b1a1306cd252f0120904562e4143 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:31:13 +0100
Subject: [PATCH 15/17] Update MinGW 5.1.x workflows to avoid double runs

---
 .github/workflows/mingw-51x-bytecode.yml | 7 ++++++-
 .github/workflows/mingw-51x.yml          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mingw-51x-bytecode.yml b/.github/workflows/mingw-51x-bytecode.yml
index e4ef4f8a..596a16b2 100644
--- a/.github/workflows/mingw-51x-bytecode.yml
+++ b/.github/workflows/mingw-51x-bytecode.yml
@@ -1,6 +1,11 @@
 name: MinGW bytecode 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/mingw-51x.yml b/.github/workflows/mingw-51x.yml
index ef9a8e50..03638b72 100644
--- a/.github/workflows/mingw-51x.yml
+++ b/.github/workflows/mingw-51x.yml
@@ -1,6 +1,11 @@
 name: MinGW 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From 413db7583567f84bd4b7f461b5cc9a0d40a5a5be Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Wed, 3 Jan 2024 17:32:21 +0100
Subject: [PATCH 16/17] Update macOS and Cygwin 5.1.x workflows to avoid double
 runs

---
 .github/workflows/cygwin-51x.yml | 7 ++++++-
 .github/workflows/macosx-51x.yml | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cygwin-51x.yml b/.github/workflows/cygwin-51x.yml
index 792dfd3a..e5b9584a 100644
--- a/.github/workflows/cygwin-51x.yml
+++ b/.github/workflows/cygwin-51x.yml
@@ -1,6 +1,11 @@
 name: Cygwin 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/macosx-51x.yml b/.github/workflows/macosx-51x.yml
index e20a497e..8dbb8700 100644
--- a/.github/workflows/macosx-51x.yml
+++ b/.github/workflows/macosx-51x.yml
@@ -1,6 +1,11 @@
 name: macOS 5.1
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build:

From cfe59f012c9635ca05da44174e98ff783f7a2877 Mon Sep 17 00:00:00 2001
From: Jan Midtgaard <mail@janmidtgaard.dk>
Date: Mon, 8 Jan 2024 18:30:35 +0100
Subject: [PATCH 17/17] Update opam workflow to avoid double runs

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

diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
index 22e563a8..90922403 100644
--- a/.github/workflows/opam.yml
+++ b/.github/workflows/opam.yml
@@ -4,7 +4,12 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   build-and-test: