Merge pull request #36 from HolyWu/patch

Workflow updates
vapoursynth · Apr 2, 2024 · bc3d32c · bc3d32c
2 parents 5b29b5f + a33b193
commit bc3d32c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -17,7 +17,7 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install Ubuntu packages
       run: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,15 +13,15 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - 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 install ffmpeg xxhash llvm meson vapoursynth
+        brew install ffmpeg llvm meson vapoursynth xxhash
 
     - name: Set environment variables for Clang/LLVM
       run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -26,19 +26,18 @@ jobs:
           git
           libtool
           mingw-w64-ucrt-x86_64-dav1d
-          mingw-w64-ucrt-x86_64-xxhash
           mingw-w64-ucrt-x86_64-meson
           mingw-w64-ucrt-x86_64-nasm
           mingw-w64-ucrt-x86_64-toolchain
           mingw-w64-ucrt-x86_64-vapoursynth
           mingw-w64-ucrt-x86_64-vulkan-headers
+          mingw-w64-ucrt-x86_64-xxhash
 
     - name: Install nv-codec-headers
       run: |
         git clone https://github.com/FFmpeg/nv-codec-headers.git --depth 1
         pushd nv-codec-headers
-        sed -e 's#/usr/local#/ucrt64#' -i Makefile
-        make install -j2
+        make install -j$(nproc) PREFIX=/ucrt64
         popd
         rm -rf nv-codec-headers
 
@@ -47,7 +46,7 @@ jobs:
         git clone https://git.ffmpeg.org/ffmpeg.git --depth 1
         pushd ffmpeg
         ./configure --prefix=/ucrt64 --enable-gpl --enable-version3 --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter --disable-encoders --disable-muxers --enable-libdav1d --disable-nvenc --disable-debug
-        make install -j2
+        make install -j$(nproc)
         popd
         rm -rf ffmpeg