Adjusted workflow config to match apple_framework

Author: zeyus

.github/workflows/apple.yml

@@ -38,6 +38,9 @@ jobs:
       matrix:
         config:
         - {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\"" }
+				# Not sure if this is needed? The above builds both targets and in theory
+				# can be tested using rosetta, but having a dedicated intel build might help catch issues?
+        - {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\""}
         - {name: "iOS", os: "macOS-latest", cmake_extra: "-DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=OS64" }
         - {name: "iOS Simulator", os: "macOS-latest", cmake_extra: "-DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR64COMBINED -G Xcode" }
 
@@ -112,6 +115,13 @@ jobs:
         install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
         install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
       timeout-minutes: 10
+    - name: unit test (intel)
+      if: matrix.config.name == 'macOS-15-intel'
+      run: |
+        mkdir -p dumps
+        install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
+        install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
+      timeout-minutes: 10
 
     - name: Package and Notarize macOS Installer
       if: matrix.config.name == 'macOS-latest'

.github/workflows/cppcmake.yml

@@ -44,11 +44,7 @@ jobs:
         - {name: "windows-x64",  os: "windows-latest", cmake_extra: "-T v142,host=x86"}
         - {name: "windows-32",   os: "windows-latest", cmake_extra: "-T v142,host=x86 -A Win32"}
         - {name: "windows-arm",  os: "windows-11-arm", cmake_extra: "-T v143,host=ARM64 -A ARM64"}
-        - {name: "macOS-latest-arm", os: "macOS-latest"}
-        - {name: "macOS-15-intel", os: "macOS-15-intel"}
-    
     # runs all steps in the container configured in config.docker or as subprocesses when empty
-    container: ${{ matrix.config.docker }}
     steps:
     - uses: actions/checkout@v4