Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explicit macOS Intel+ARM64 runners #458

Merged
merged 8 commits into from
May 17, 2024
Merged

Add explicit macOS Intel+ARM64 runners #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34fee10
Avoid macos-latest, rename workflows to macos-intel
jmid May 16, 2024
37bf3a8
Update README with new intel workflow names
jmid May 16, 2024
034b0e6
Add explicit macOS ARM64/M1 workflows
jmid May 16, 2024
d7783c7
Update README with macOS ARM64 badges
jmid May 16, 2024
77ebc56
Update macOS README link texts
jmid May 16, 2024
f75289c
Make parallel Sys STM test negative on macOS ARM64
jmid May 16, 2024
4fda9c2
Update opam workflows to 5.2.0 release and trunk being 5.3.0
jmid May 16, 2024
adff14c
Bump STM Sys test parallel count to 2500
jmid May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/macosx-500.yml → .github/workflows/macosx-arm64-500.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS 5.0.0
name: macOS-ARM64 5.0.0

on:
schedule:
Expand All @@ -10,4 +10,4 @@ jobs:
build:
uses: ./.github/workflows/common.yml
with:
runs_on: 'macos-latest'
runs_on: 'macos-14'
4 changes: 2 additions & 2 deletions .github/workflows/macosx-51x.yml → .github/workflows/macosx-arm64-51x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS 5.1
name: macOS-ARM64 5.1

on:
schedule:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/macosx-520.yml → .github/workflows/macosx-arm64-520.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS 5.2
name: macOS-ARM64 5.2

on:
pull_request:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions .github/workflows/macosx-530-trunk.yml → .github/workflows/macosx-arm64-530-trunk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS trunk
name: macOS-ARM64 trunk

on:
pull_request:
Expand All @@ -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'
13 changes: 13 additions & 0 deletions .github/workflows/macosx-intel-500.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
14 changes: 14 additions & 0 deletions .github/workflows/macosx-intel-51x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
15 changes: 15 additions & 0 deletions .github/workflows/macosx-intel-520.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
16 changes: 16 additions & 0 deletions .github/workflows/macosx-intel-530-trunk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
3 changes: 2 additions & 1 deletion .github/workflows/opam.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 8 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ 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)
[![MinGW 5.0.0](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/mingw-500.yml)
[![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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions src/sys/stm_tests.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Loading