File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change 3838 matrix :
3939 config :
4040 - {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\"" }
41+ # Not sure if this is needed? The above builds both targets and in theory
42+ # can be tested using rosetta, but having a dedicated intel build might help catch issues?
43+ - {name: "macOS-15-intel", os: "macOS-15-intel", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON -DCMAKE_OSX_ARCHITECTURES=\"x86_64\""}
4144 - {name: "iOS", os: "macOS-latest", cmake_extra: "-DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=OS64" }
4245 - {name: "iOS Simulator", os: "macOS-latest", cmake_extra: "-DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR64COMBINED -G Xcode" }
4346
@@ -112,6 +115,13 @@ jobs:
112115 install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
113116 install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
114117 timeout-minutes : 10
118+ - name : unit test (intel)
119+ if : matrix.config.name == 'macOS-15-intel'
120+ run : |
121+ mkdir -p dumps
122+ install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
123+ install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
124+ timeout-minutes : 10
115125
116126 - name : Package and Notarize macOS Installer
117127 if : matrix.config.name == 'macOS-latest'
Original file line number Diff line number Diff line change @@ -33,15 +33,18 @@ jobs:
3333 build :
3434 name : ${{ matrix.config.name }}
3535 runs-on : ${{ matrix.config.os }}
36+ timeout-minutes : 30
3637 strategy :
3738 fail-fast : false
3839 matrix :
3940 config :
4041 - {name: "ubuntu-22.04", os: "ubuntu-22.04", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
4142 - {name: "ubuntu-24.04", os: "ubuntu-24.04", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
43+ - {name: "ubuntu-24.04-arm", os: "ubuntu-24.04-arm", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
4244 - {name: "windows-x64", os: "windows-latest", cmake_extra: "-T v142,host=x86"}
4345 - {name: "windows-32", os: "windows-latest", cmake_extra: "-T v142,host=x86 -A Win32"}
44-
46+ - {name: "windows-arm", os: "windows-11-arm", cmake_extra: "-T v143,host=ARM64 -A ARM64"}
47+ # runs all steps in the container configured in config.docker or as subprocesses when empty
4548 steps :
4649 - uses : actions/checkout@v4
4750
You can’t perform that action at this time.
0 commit comments