From e117e4af3b9c8624c43d0379446370dcc91ebe4a Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Mon, 18 Mar 2024 13:35:12 -0700
Subject: [PATCH] Add macos-14

macos-14 [Beta] has the M1 CPU.
---
 .../workflows/ci-unix-static-sanitized.yml    | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-unix-static-sanitized.yml b/.github/workflows/ci-unix-static-sanitized.yml
index 19e5d18b41..51d576db56 100644
--- a/.github/workflows/ci-unix-static-sanitized.yml
+++ b/.github/workflows/ci-unix-static-sanitized.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, macos-14]
         sanitizer: [ undefined ] # TODO(yguyon): Add address, memory, thread
 
     env:
@@ -29,6 +29,10 @@ jobs:
         with:
           version: 2.15.05
       - uses: seanmiddleditch/gha-setup-ninja@8b297075da4cd2a5f1fd21fe011b499edf06e9d2 # v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
       - run: pip install meson
 
       - name: Cache external dependencies
@@ -36,7 +40,7 @@ jobs:
         uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
         with:
           path: ext
-          key: ${{ runner.os }}-${{ matrix.sanitizer }}-${{ hashFiles('ext/*.cmd') }}
+          key: ${{ runner.os }}-${{ matrix.sanitizer }}-${{ hashFiles('ext/*.cmd') }}-v2
 
       - name: Build aom
         if: steps.cache-ext.outputs.cache-hit != 'true'
@@ -51,7 +55,6 @@ jobs:
         working-directory: ./ext
         run: >
           sed -i -e 's/meson setup \(.*\) \.\./meson setup \1 '"-Db_sanitize=${{ matrix.sanitizer }} -Db_lundef=false"' ../g' dav1d.cmd
-          
           ./dav1d.cmd
       - name: Build libyuv
         if: steps.cache-ext.outputs.cache-hit != 'true'
@@ -69,6 +72,14 @@ jobs:
           CFLAGS: -fsanitize=${{ matrix.sanitizer }}
           CXXFLAGS: -fsanitize=${{ matrix.sanitizer }}
           LDFLAGS: -fsanitize=${{ matrix.sanitizer }}
+      - name: Build libjpeg
+        if: steps.cache-ext.outputs.cache-hit != 'true'
+        working-directory: ./ext
+        run: ./libjpeg.cmd
+      - name: Build zlib and libpng
+        if: steps.cache-ext.outputs.cache-hit != 'true'
+        working-directory: ./ext
+        run: ./zlibpng.cmd
       - name: Build GoogleTest
         if: steps.cache-ext.outputs.cache-hit != 'true'
         working-directory: ./ext
@@ -79,7 +90,9 @@ jobs:
         run: >
           cmake -S . -B build -G Ninja
           -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF
-          -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_LIBYUV=LOCAL -DAVIF_LIBSHARPYUV=LOCAL
+          -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL
+          -DAVIF_LIBYUV=LOCAL -DAVIF_LIBSHARPYUV=LOCAL
+          -DAVIF_JPEG=LOCAL -DAVIF_ZLIBPNG=LOCAL
           -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
           -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON
         env: