From 1bc2a95e2d3a5b4f7194cc1722ab9504fa115090 Mon Sep 17 00:00:00 2001 From: Maryla Date: Tue, 27 Aug 2024 13:12:50 +0200 Subject: [PATCH] Rename workflow and remove unneeded config, add local libyuv --- ...inux-shared-local-fuzztest.yml => ci-fuzztest.yml} | 11 +++-------- ext/libargparse.cmd | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) rename .github/workflows/{ci-linux-shared-local-fuzztest.yml => ci-fuzztest.yml} (91%) diff --git a/.github/workflows/ci-linux-shared-local-fuzztest.yml b/.github/workflows/ci-fuzztest.yml similarity index 91% rename from .github/workflows/ci-linux-shared-local-fuzztest.yml rename to .github/workflows/ci-fuzztest.yml index d6d3d7e94b..2e620dd540 100644 --- a/.github/workflows/ci-linux-shared-local-fuzztest.yml +++ b/.github/workflows/ci-fuzztest.yml @@ -4,7 +4,7 @@ # see https://github.com/google/fuzztest/blob/main/doc/quickstart-cmake.md # Runs on ubuntu only. libavif is built with clang. -name: CI Unix Shared Local Fuzztest +name: CI Fuzztest on: [push, pull_request] permissions: @@ -22,11 +22,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-24.04] - libyuv: [OFF] - include: - - runs-on: ubuntu-24.04 - compiler: gcc - gcc: 14 + libyuv: [OFF, LOCAL] name: build-shared-local-fuzztest @@ -37,9 +33,8 @@ jobs: with: codec-aom: 'LOCAL' codec-dav1d: 'LOCAL' - gcc-version: ${{ matrix.gcc }} libxml2: 'LOCAL' - libyuv: 'LOCAL' + libyuv: ${{ matrix.libyuv }} recent-cmake: 'true' - name: Build fuzztest if: steps.setup.outputs.ext-cache-hit != 'true' diff --git a/ext/libargparse.cmd b/ext/libargparse.cmd index 509c7b0cdf..d04045cfe9 100755 --- a/ext/libargparse.cmd +++ b/ext/libargparse.cmd @@ -8,10 +8,10 @@ : # If you're running this on Windows, be sure you've already run this (from your VC2019 install dir): : # "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat" -git clone --single-branch https://github.com/kmurray/libargparse.git +git clone https://github.com/maryla-uc/libargparse.git cd libargparse -git checkout ee74d1b53bd680748af14e737378de57e2a0a954 +git checkout 81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf mkdir build cd build