From eb8049e90eb205c3ee806767157dd583bd6c5c55 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 9 Nov 2022 09:09:15 +0100 Subject: [PATCH] CI: enable Vulkan for mac + require except of U20.04 where it currently doesn't run --- .github/scripts/macOS/prepare.sh | 2 +- .github/workflows/ccpp.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 7a1f8a17a..dc2efc935 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -18,7 +18,7 @@ echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> "$GITHUB_ENV" brew install autoconf automake cppunit libtool pkg-config brew install libsoxr speexdsp -brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf +brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf vulkan-loader brew install imagemagick jack libnatpmp opencv wolfssl brew install ossp-uuid # for cineform brew install qt@5 diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5fdfe9c39..0e61cb11e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -1,7 +1,7 @@ name: C/C++ CI env: - FEATURES: '--enable-option-checking=fatal --with-live555=/usr/local --enable-aja --enable-blank --enable-cineform --enable-decklink --enable-file --enable-gl --enable-gl-display --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-resize --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-sdl2 --enable-sdl_mixer --enable-sdp-http --enable-soxr --enable-speexdsp --enable-swmix --enable-libswscale --enable-testcard-extras=all --enable-text --enable-video-mixer --enable-ximea --enable-zfec' + FEATURES: '--enable-option-checking=fatal --with-live555=/usr/local --enable-aja --enable-blank --enable-cineform --enable-decklink --enable-file --enable-gl --enable-gl-display --enable-holepunch --enable-jack --enable-jack-transport --enable-libavcodec --enable-natpmp --enable-ndi --enable-openssl --enable-pcp --enable-portaudio --enable-qt --enable-resize --enable-rtdxt --enable-rtsp --enable-rtsp-server --enable-scale --enable-sdl2 --enable-sdl_mixer --enable-sdp-http --enable-soxr --enable-speexdsp --enable-swmix --enable-libswscale --enable-testcard-extras=all --enable-text --enable-video-mixer --enable-vulkan --enable-ximea --enable-zfec' CUDA_FEATURES: '--enable-cuda_dxt --enable-gpujpeg --enable-ldgm-gpu --enable-uyvy' on: @@ -105,7 +105,7 @@ jobs: if: steps.cache-ffmpeg.outputs.cache-hit == 'true' run: .github/scripts/Linux/install_ffmpeg.sh - name: configure - run: "./autogen.sh --enable-plugins ${{ env.CUDA_FEATURES }} ${{ env.FEATURES }} --enable-alsa --enable-v4l2 || { RC=$?; cat config.log; exit $RC; }" + run: "./autogen.sh --enable-plugins ${{ env.CUDA_FEATURES }} ${{ env.FEATURES }} --enable-alsa --enable-v4l2 --enable-vulkan=auto || { RC=$?; cat config.log; exit $RC; }" - name: make run: make -j4 - name: make check