diff --git a/.github/workflows/macosx-500.yml b/.github/workflows/macosx-arm64-500.yml similarity index 77% rename from .github/workflows/macosx-500.yml rename to .github/workflows/macosx-arm64-500.yml index 564c50ac..6202766c 100644 --- a/.github/workflows/macosx-500.yml +++ b/.github/workflows/macosx-arm64-500.yml @@ -1,4 +1,4 @@ -name: macOS 5.0.0 +name: macOS-ARM64 5.0.0 on: schedule: @@ -10,4 +10,4 @@ jobs: build: uses: ./.github/workflows/common.yml with: - runs_on: 'macos-latest' + runs_on: 'macos-14' diff --git a/.github/workflows/macosx-51x.yml b/.github/workflows/macosx-arm64-51x.yml similarity index 81% rename from .github/workflows/macosx-51x.yml rename to .github/workflows/macosx-arm64-51x.yml index dec10c5e..bfe137c7 100644 --- a/.github/workflows/macosx-51x.yml +++ b/.github/workflows/macosx-arm64-51x.yml @@ -1,4 +1,4 @@ -name: macOS 5.1 +name: macOS-ARM64 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-14' diff --git a/.github/workflows/macosx-520.yml b/.github/workflows/macosx-arm64-520.yml similarity index 80% rename from .github/workflows/macosx-520.yml rename to .github/workflows/macosx-arm64-520.yml index e6f10e8c..619af02b 100644 --- a/.github/workflows/macosx-520.yml +++ b/.github/workflows/macosx-arm64-520.yml @@ -1,4 +1,4 @@ -name: macOS 5.2 +name: macOS-ARM64 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-14' diff --git a/.github/workflows/macosx-530-trunk.yml b/.github/workflows/macosx-arm64-530-trunk.yml similarity index 82% rename from .github/workflows/macosx-530-trunk.yml rename to .github/workflows/macosx-arm64-530-trunk.yml index c8c11cc5..8a5bac99 100644 --- a/.github/workflows/macosx-530-trunk.yml +++ b/.github/workflows/macosx-arm64-530-trunk.yml @@ -1,4 +1,4 @@ -name: macOS trunk +name: macOS-ARM64 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-14' diff --git a/.github/workflows/macosx-intel-500.yml b/.github/workflows/macosx-intel-500.yml new file mode 100644 index 00000000..5adee673 --- /dev/null +++ b/.github/workflows/macosx-intel-500.yml @@ -0,0 +1,13 @@ +name: macOS-intel 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-13' diff --git a/.github/workflows/macosx-intel-51x.yml b/.github/workflows/macosx-intel-51x.yml new file mode 100644 index 00000000..286cfea4 --- /dev/null +++ b/.github/workflows/macosx-intel-51x.yml @@ -0,0 +1,14 @@ +name: macOS-intel 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-13' diff --git a/.github/workflows/macosx-intel-520.yml b/.github/workflows/macosx-intel-520.yml new file mode 100644 index 00000000..26a639bf --- /dev/null +++ b/.github/workflows/macosx-intel-520.yml @@ -0,0 +1,15 @@ +name: macOS-intel 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-13' diff --git a/.github/workflows/macosx-intel-530-trunk.yml b/.github/workflows/macosx-intel-530-trunk.yml new file mode 100644 index 00000000..badd35be --- /dev/null +++ b/.github/workflows/macosx-intel-530-trunk.yml @@ -0,0 +1,16 @@ +name: macOS-intel 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-13' 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 diff --git a/README.md b/README.md index 2a703862..9919c32e 100644 --- a/README.md +++ b/README.md @@ -4,7 +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-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-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) @@ -12,7 +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-51x.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-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) @@ -22,7 +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-520.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-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) @@ -32,7 +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-530-trunk.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/macosx-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) diff --git a/src/sys/stm_tests.ml b/src/sys/stm_tests.ml index 0ae67ad8..8738a11e 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" + else Sys_dom.neg_agree_test_par ~count:2500 ~name:"STM Sys test parallel" ]