Merge branch 'master' of https://github.com/vapoursynth/bestsource

vapoursynth · May 25, 2024 · 53c35da · 53c35da
2 parents ddaac8d + f6e272b
commit 53c35da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -4,11 +4,11 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
-      CC: gcc-13
-      CXX: g++-13
+      CC: gcc-14
+      CXX: g++-14
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -17,19 +17,17 @@ jobs:
 
     - name: Install Homebrew packages
       run: |
-        export HOMEBREW_NO_INSTALL_CLEANUP=1
         export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-        # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
-        # brew update
+        brew update
         brew install ffmpeg llvm meson vapoursynth xxhash
 
     - name: Set environment variables for Clang/LLVM
       run: |
-        echo "CC=/usr/local/opt/llvm/bin/clang" >> $GITHUB_ENV
-        echo "CXX=/usr/local/opt/llvm/bin/clang++" >> $GITHUB_ENV
-        echo "PATH=/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_ENV
+        echo "CC=/opt/homebrew/opt/llvm/bin/clang" >> $GITHUB_ENV
+        echo "CXX=/opt/homebrew/opt/llvm/bin/clang++" >> $GITHUB_ENV
+        echo "PATH=/opt/homebrew/opt/llvm/bin:$PATH" >> $GITHUB_ENV
 
     - name: Build
       run: |
-        meson setup -Dcpp_link_args=-fuse-ld=lld build
+        meson setup "-Dcpp_link_args=['-fuse-ld=lld', '-L/opt/homebrew/opt/llvm/lib/c++', '-Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++']" build
         ninja -C build