fix mac

commaai · Jul 20, 2024 · b75c9e7 · b75c9e7
1 parent 56b29ba
commit b75c9e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -49,26 +49,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ["ubuntu-20.04", "ubuntu-24.04", "macos-14"]
+        os: ["ubuntu-20.04", "ubuntu-24.04"]
         python: ["3.11", "3.12"]
         flags: ['', '--asan', '--ubsan']
         backend: ['MSGQ', 'ZMQ']
-        exclude:
-          - os: "macos-14"
-            backend: "MSGQ"
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
     - name: Installing ubuntu requirements
-      if: ${{startsWith(matrix.os, 'ubuntu')}}
       run:
         scripts/ubuntu_dependencies.sh
     - name: Installing macos requirements
-      if: ${{startsWith(matrix.os, 'macos')}}
-      run:
-        scripts/macos_dependencies.sh
     - name: Building msgq
       run: |
         pip3 install -e .[dev]

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -31,7 +31,8 @@ jobs:
         CIBW_BEFORE_BUILD_MACOS: "bash {project}/scripts/macos_dependencies.sh"
         CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
         CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28"
-        #CIBW_TEST_COMMAND: "pip install -r {project}/requirements.txt && pytest {package}"
+        CIBW_TEST_COMMAND: "pip install -r {project}/requirements.txt && pytest {package}"
+        CIBW_TEST_SKIP: "*-macosx_arm64"
         MACOSX_DEPLOYMENT_TARGET: "14.0"