[testing] python3.12 v5

Netflix · Mar 20, 2024 · 6b9a23d · 6b9a23d
1 parent b3046dd
commit 6b9a23d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 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 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
@@ -9,7 +9,7 @@ passenv = APPVEYOR*
           TEST_MARKER
           TRAVIS*
           LDFLAGS
-          CPPFLAGS
+          LD
           CC
           CXX
 setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ passenv = APPVEYOR* @@
               TEST_MARKER
               TRAVIS*
               LDFLAGS
-              CPPFLAGS
+              LD
               CC
               CXX
     setenv = COVERAGE_FILE={toxworkdir}/.coverage.{envname}
@@ Expand Down @@