Skip to content

Commit

Permalink
Fix cache
Browse files Browse the repository at this point in the history
  • Loading branch information
vrabaud committed May 23, 2024
1 parent 7466cbf commit 16704f6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux-golden-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
libyuv: 'LOCAL'
recent-cmake: true
- name: Build mp4box
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: bash -e mp4box.sh

Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci-unix-static-sanitized.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,37 +41,36 @@ jobs:
codec-rav1e: 'OFF'

- name: Build aom
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: >
sed -i -e 's/cmake -G Ninja \(.*\) \.\./cmake -G Ninja \1 -DSANITIZE=${{ matrix.sanitizer }} ../g' aom.cmd
./aom.cmd
- name: Build dav1d
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ steps.cache-ext.outputs.cache-hit }}
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'
working-directory: ./ext
run: ./libyuv.cmd
env:
CFLAGS: -fsanitize=${{ matrix.sanitizer }}
CXXFLAGS: -fsanitize=${{ matrix.sanitizer }}
LDFLAGS: -fsanitize=${{ matrix.sanitizer }}
- name: Build libsharpyuv
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./libsharpyuv.cmd
env:
CFLAGS: -fsanitize=${{ matrix.sanitizer }}
CXXFLAGS: -fsanitize=${{ matrix.sanitizer }}
LDFLAGS: -fsanitize=${{ matrix.sanitizer }}
- name: Build GoogleTest
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
# Note: "apt install googletest" is sometimes insufficient for find_package(GTest) so build in ext/ instead.
run: bash -e googletest.cmd
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci-windows-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
codec-dav1d: 'LOCAL'

- name: Build aom
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./aom.cmd
# Visual Studio 2022 has an issue starting at 17.8.0 which might cause
Expand All @@ -34,11 +34,11 @@ jobs:
CC: clang-cl
CXX: clang-cl
- name: Build dav1d
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./dav1d.cmd
- name: Build libyuv
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./libyuv.cmd
# Use clang-cl to build libyuv. The assembly code in libyuv is written in the
Expand All @@ -47,15 +47,15 @@ jobs:
CC: clang-cl
CXX: clang-cl
- name: Build libsharpyuv
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./libsharpyuv.cmd
- name: Build libjpeg
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./libjpeg.cmd
- name: Build zlib and libpng
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./zlibpng.cmd

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
codec-rav1e: 'LOCAL'

- name: Build aom
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./aom.cmd
# Visual Studio 2022 has an issue starting at 17.8.0 which might cause
Expand All @@ -55,7 +55,7 @@ jobs:
CC: clang-cl
CXX: clang-cl
- name: Build libyuv
if: steps.cache-ext.outputs.cache-hit != 'true'
if: ${{ !steps.cache-ext.outputs.cache-hit }}
working-directory: ./ext
run: ./libyuv.cmd
# Use clang-cl to build libyuv. The assembly code in libyuv is written in the
Expand Down

0 comments on commit 16704f6

Please sign in to comment.