From f04d714bc25f3421a1ab6df771a502fd5d120f03 Mon Sep 17 00:00:00 2001 From: nilfm Date: Thu, 8 Feb 2024 11:05:39 -0500 Subject: [PATCH] .github: fix macos libsvm-official install --- .github/workflows/libvmaf.yml | 14 +++++++++++--- python/tox.ini | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/libvmaf.yml b/.github/workflows/libvmaf.yml index 06811506b..0332fcfc3 100644 --- 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 - tox -c python/ -e py -- -v -p no:warnings -m 'main or lib' --doctest-modules + - name: Run tox tests (ubuntu) + if: matrix.os == 'ubuntu-latest' + run: | + tox -c python + - 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 - name: Get binary path & Current Release id: get_info diff --git a/python/tox.ini b/python/tox.ini index 4f15faba2..e82beade4 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38, coverage +envlist = py312, coverage [testenv]