.github: fix macos libsvm-official install

Netflix · Feb 8, 2024 · b02d737 · b02d737
1 parent 39f6cfe
commit b02d737
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/libvmaf.yml b/.github/workflows/libvmaf.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Install dependencies (mac)
         if: matrix.os == 'macos-latest'
         run: |
-          brew install -q ninja nasm ccache
+          brew install -q ninja nasm ccache llvm
 
           $CC --version
           meson --version
@@ -75,11 +75,19 @@ jobs:
       - name: Run tests
         run: |
           sudo ninja -vC libvmaf/build test
-      - name: Run tox tests
+      - name: Set up tox
         run: |
           mkdir -p ~/.ccache && sudo chown -R $(whoami) ~/.ccache
           pip install 'tox<4'
+      - name: Run tox tests (ubuntu)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
           tox -c python/ -e py -- -v -p no:warnings -m 'main or lib' --doctest-modules
+      - name: Run tox tests (mac)
+        if: matrix.os == 'macos-latest'
+        run: |
+          CC=$HOMEBREW_PREFIX/opt/llvm/bin/clang CXX=$HOMEBREW_PREFIX/opt/llvm/bin/clang++ \
+            tox -c python/ -e p -- -v -p no:warnings -m 'main or lib' --doctest-modules
 
       - name: Get binary path & Current Release
         id: get_info

diff --git a/python/tox.ini b/python/tox.ini
@@ -1,9 +1,9 @@
 [tox]
-envlist = py38, coverage
+envlist = py312, coverage
 
 
 [testenv]
-passenv = APPVEYOR* CI SSL_CERT_FILE TEST_MARKER TRAVIS*
+passenv = APPVEYOR* CI SSL_CERT_FILE TEST_MARKER TRAVIS* CC CXX
 setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}
 usedevelop = True
 deps = -rrequirements.txt