From 6b9a23da3a8e627902a75d936b52697f1f5ddb98 Mon Sep 17 00:00:00 2001 From: nilfm Date: Wed, 20 Mar 2024 15:20:48 -0400 Subject: [PATCH] [testing] python3.12 v5 --- .github/workflows/libvmaf.yml | 10 ++++++---- python/tox.ini | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/libvmaf.yml b/.github/workflows/libvmaf.yml index 93cb0bebb..509d0e72d 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 llvm libomp + brew install -q ninja nasm ccache llvm@14 libomp $CC --version meson --version @@ -86,9 +86,11 @@ jobs: - name: Run tox tests (mac) if: matrix.os == 'macos-latest' run: | - LDFLAGS="-L$(brew --prefix)/opt/libomp/lib" CPPFLAGS="-I$(brew --prefix)/opt/libomp/include" \ - CC=$(brew --prefix)/opt/llvm/bin/clang CXX=$(brew --prefix)/opt/llvm/bin/clang++ \ - tox -c python + CC=/opt/homebrew/opt/llvm@14/bin/clang \ + CXX=/opt/homebrew/opt/llvm@14/bin/clang++ \ + LD=/opt/homebrew/opt/llvm@14/bin/llvm-link \ + LDFLAGS='-L/opt/homebrew/opt/llvm@14/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm@14/lib/c++ -L/opt/homebrew/opt/llvm@14/lib' \ + tox -c python - name: Get binary path & Current Release id: get_info diff --git a/python/tox.ini b/python/tox.ini index 64159f888..e70a63725 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -9,7 +9,7 @@ passenv = APPVEYOR* TEST_MARKER TRAVIS* LDFLAGS - CPPFLAGS + LD CC CXX setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}