From 3e3e3d30797ef018b80407febceceb78736fa063 Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Wed, 7 Feb 2024 18:22:08 +0100 Subject: [PATCH 1/5] Rename linux-520-trunk workflows --- .../workflows/{linux-520-trunk-32bit.yml => linux-520-32bit.yml} | 0 .../{linux-520-trunk-bytecode.yml => linux-520-bytecode.yml} | 0 .../workflows/{linux-520-trunk-debug.yml => linux-520-debug.yml} | 0 .github/workflows/{linux-520-trunk-fp.yml => linux-520-fp.yml} | 0 .github/workflows/{linux-520-trunk.yml => linux-520.yml} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{linux-520-trunk-32bit.yml => linux-520-32bit.yml} (100%) rename .github/workflows/{linux-520-trunk-bytecode.yml => linux-520-bytecode.yml} (100%) rename .github/workflows/{linux-520-trunk-debug.yml => linux-520-debug.yml} (100%) rename .github/workflows/{linux-520-trunk-fp.yml => linux-520-fp.yml} (100%) rename .github/workflows/{linux-520-trunk.yml => linux-520.yml} (100%) diff --git a/.github/workflows/linux-520-trunk-32bit.yml b/.github/workflows/linux-520-32bit.yml similarity index 100% rename from .github/workflows/linux-520-trunk-32bit.yml rename to .github/workflows/linux-520-32bit.yml diff --git a/.github/workflows/linux-520-trunk-bytecode.yml b/.github/workflows/linux-520-bytecode.yml similarity index 100% rename from .github/workflows/linux-520-trunk-bytecode.yml rename to .github/workflows/linux-520-bytecode.yml diff --git a/.github/workflows/linux-520-trunk-debug.yml b/.github/workflows/linux-520-debug.yml similarity index 100% rename from .github/workflows/linux-520-trunk-debug.yml rename to .github/workflows/linux-520-debug.yml diff --git a/.github/workflows/linux-520-trunk-fp.yml b/.github/workflows/linux-520-fp.yml similarity index 100% rename from .github/workflows/linux-520-trunk-fp.yml rename to .github/workflows/linux-520-fp.yml diff --git a/.github/workflows/linux-520-trunk.yml b/.github/workflows/linux-520.yml similarity index 100% rename from .github/workflows/linux-520-trunk.yml rename to .github/workflows/linux-520.yml From 9ba7a447f70944498f7f2a83bf12de302ba7350d Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Wed, 7 Feb 2024 18:24:07 +0100 Subject: [PATCH 2/5] Rename macOS, MinGW, and Cygwin 520-trunk workflows --- .github/workflows/{cygwin-520-trunk.yml => cygwin-520.yml} | 0 .github/workflows/{macosx-520-trunk.yml => macosx-520.yml} | 0 .../{mingw-520-trunk-bytecode.yml => mingw-520-bytecode.yml} | 0 .github/workflows/{mingw-520-trunk.yml => mingw-520.yml} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{cygwin-520-trunk.yml => cygwin-520.yml} (100%) rename .github/workflows/{macosx-520-trunk.yml => macosx-520.yml} (100%) rename .github/workflows/{mingw-520-trunk-bytecode.yml => mingw-520-bytecode.yml} (100%) rename .github/workflows/{mingw-520-trunk.yml => mingw-520.yml} (100%) diff --git a/.github/workflows/cygwin-520-trunk.yml b/.github/workflows/cygwin-520.yml similarity index 100% rename from .github/workflows/cygwin-520-trunk.yml rename to .github/workflows/cygwin-520.yml diff --git a/.github/workflows/macosx-520-trunk.yml b/.github/workflows/macosx-520.yml similarity index 100% rename from .github/workflows/macosx-520-trunk.yml rename to .github/workflows/macosx-520.yml diff --git a/.github/workflows/mingw-520-trunk-bytecode.yml b/.github/workflows/mingw-520-bytecode.yml similarity index 100% rename from .github/workflows/mingw-520-trunk-bytecode.yml rename to .github/workflows/mingw-520-bytecode.yml diff --git a/.github/workflows/mingw-520-trunk.yml b/.github/workflows/mingw-520.yml similarity index 100% rename from .github/workflows/mingw-520-trunk.yml rename to .github/workflows/mingw-520.yml From 22b2f829efb41d36f7ce7b3ea09c838fbc5327d4 Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Wed, 7 Feb 2024 18:28:06 +0100 Subject: [PATCH 3/5] Update README badges to reflect renaming --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e214f9179..8e0022ca9 100644 --- a/README.md +++ b/README.md @@ -21,15 +21,15 @@ Multicore tests [![MinGW 5.1.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-51x-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-51x-bytecode.yml) [![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+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk.yml) -[![MacOSX 5.2.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-520-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-520-trunk.yml) -[![Linux 5.2.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-bytecode.yml) -[![Linux 5.2.0+trunk-debug](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-debug.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-debug.yml) -[![Linux 32-bit 5.2.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-32bit.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-32bit.yml) -[![Linux FP 5.2.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-trunk-fp.yml) -[![MinGW 5.2.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520-trunk.yml) -[![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.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) +[![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) +[![Linux FP 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-fp.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-520-fp.yml) +[![MinGW 5.2.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520.yml) +[![MinGW 5.2.0-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520-bytecode.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-520-bytecode.yml) +[![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) From 39ed6484f68761e0c600ba2fbbe104690ae342ea Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Wed, 7 Feb 2024 18:38:05 +0100 Subject: [PATCH 4/5] Update Linux 5.2.0 workflows to target alpha1 --- .github/workflows/linux-520-32bit.yml | 3 +-- .github/workflows/linux-520-bytecode.yml | 3 +-- .github/workflows/linux-520-debug.yml | 3 +-- .github/workflows/linux-520-fp.yml | 3 +-- .github/workflows/linux-520.yml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/linux-520-32bit.yml b/.github/workflows/linux-520-32bit.yml index b132888c0..1858a7a00 100644 --- a/.github/workflows/linux-520-32bit.yml +++ b/.github/workflows/linux-520-32bit.yml @@ -11,6 +11,5 @@ jobs: build: uses: ./.github/workflows/common.yml with: - compiler: 'ocaml-variants.5.2.0+trunk,ocaml-option-32bit' - compiler_git_ref: refs/heads/5.2 + compiler: 'ocaml-variants.5.2.0~alpha1+options,ocaml-option-32bit' timeout: 240 diff --git a/.github/workflows/linux-520-bytecode.yml b/.github/workflows/linux-520-bytecode.yml index 61cc7b1bc..8442a81fa 100644 --- a/.github/workflows/linux-520-bytecode.yml +++ b/.github/workflows/linux-520-bytecode.yml @@ -11,6 +11,5 @@ jobs: build: uses: ./.github/workflows/common.yml with: - compiler: 'ocaml-variants.5.2.0+trunk,ocaml-option-bytecode-only' - compiler_git_ref: refs/heads/5.2 + compiler: 'ocaml-variants.5.2.0~alpha1+options,ocaml-option-bytecode-only' timeout: 240 diff --git a/.github/workflows/linux-520-debug.yml b/.github/workflows/linux-520-debug.yml index 9e36638ca..e2c1fb1fe 100644 --- a/.github/workflows/linux-520-debug.yml +++ b/.github/workflows/linux-520-debug.yml @@ -11,8 +11,7 @@ jobs: build: uses: ./.github/workflows/common.yml with: - compiler: 'ocaml-variants.5.2.0+trunk' - compiler_git_ref: refs/heads/5.2 + compiler: 'ocaml-base-compiler.5.2.0~alpha1' dune_profile: 'debug-runtime' runparam: 's=4096,v=0,V=1' timeout: 240 diff --git a/.github/workflows/linux-520-fp.yml b/.github/workflows/linux-520-fp.yml index 8f5e1c20e..9030c27e6 100644 --- a/.github/workflows/linux-520-fp.yml +++ b/.github/workflows/linux-520-fp.yml @@ -11,6 +11,5 @@ jobs: build: uses: ./.github/workflows/common.yml with: - compiler: 'ocaml-variants.5.2.0+trunk,ocaml-option-fp' - compiler_git_ref: refs/heads/5.2 + compiler: 'ocaml-variants.5.2.0~alpha1+options,ocaml-option-fp' timeout: 240 diff --git a/.github/workflows/linux-520.yml b/.github/workflows/linux-520.yml index 003268ccc..9b8dafd1c 100644 --- a/.github/workflows/linux-520.yml +++ b/.github/workflows/linux-520.yml @@ -11,5 +11,4 @@ jobs: build: uses: ./.github/workflows/common.yml with: - compiler: 'ocaml-variants.5.2.0+trunk' - compiler_git_ref: refs/heads/5.2 + compiler: 'ocaml-base-compiler.5.2.0~alpha1' From 28ca9a4c6030ca140f6c776c007551c104873ad4 Mon Sep 17 00:00:00 2001 From: Jan Midtgaard Date: Wed, 7 Feb 2024 18:44:10 +0100 Subject: [PATCH 5/5] Update macOS, MinGW, and Cygwin 5.2.0 workflows to target alpha1 --- .github/workflows/cygwin-520.yml | 3 +-- .github/workflows/macosx-520.yml | 3 +-- .github/workflows/mingw-520-bytecode.yml | 3 +-- .github/workflows/mingw-520.yml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cygwin-520.yml b/.github/workflows/cygwin-520.yml index a631ea7df..248f40ce2 100644 --- a/.github/workflows/cygwin-520.yml +++ b/.github/workflows/cygwin-520.yml @@ -12,7 +12,6 @@ jobs: uses: ./.github/workflows/common.yml with: runs_on: windows-latest - compiler: ocaml.5.2.0 + compiler: ocaml-variants.5.2.0~alpha1+options+win cygwin: true - compiler_git_ref: refs/heads/5.2 timeout: 360 diff --git a/.github/workflows/macosx-520.yml b/.github/workflows/macosx-520.yml index f764f6a73..2f05b5347 100644 --- a/.github/workflows/macosx-520.yml +++ b/.github/workflows/macosx-520.yml @@ -11,6 +11,5 @@ jobs: build: uses: ./.github/workflows/common.yml with: - compiler: 'ocaml-variants.5.2.0+trunk' - compiler_git_ref: refs/heads/5.2 + compiler: 'ocaml-base-compiler.5.2.0~alpha1' runs_on: 'macos-latest' diff --git a/.github/workflows/mingw-520-bytecode.yml b/.github/workflows/mingw-520-bytecode.yml index 5fb4f4480..2f949e822 100644 --- a/.github/workflows/mingw-520-bytecode.yml +++ b/.github/workflows/mingw-520-bytecode.yml @@ -12,6 +12,5 @@ jobs: uses: ./.github/workflows/common.yml with: runs_on: windows-latest - compiler: ocaml.5.2.0,ocaml-option-mingw,ocaml-option-bytecode-only - compiler_git_ref: refs/heads/5.2 + compiler: ocaml-variants.5.2.0~alpha1+options+win,ocaml-option-mingw,ocaml-option-bytecode-only timeout: 240 diff --git a/.github/workflows/mingw-520.yml b/.github/workflows/mingw-520.yml index 0c91e4bbe..095771550 100644 --- a/.github/workflows/mingw-520.yml +++ b/.github/workflows/mingw-520.yml @@ -12,6 +12,5 @@ jobs: uses: ./.github/workflows/common.yml with: runs_on: windows-latest - compiler: ocaml.5.2.0,ocaml-option-mingw - compiler_git_ref: refs/heads/5.2 + compiler: ocaml-variants.5.2.0~alpha1+options+win,ocaml-option-mingw timeout: 240