diff --git a/.github/actions/setup-common/action.yml b/.github/actions/setup-common/action.yml index e1454dce15..d134fcc772 100644 --- a/.github/actions/setup-common/action.yml +++ b/.github/actions/setup-common/action.yml @@ -20,16 +20,16 @@ runs: uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.x' - - name: Set up CMake < 3.18 + - name: Set up CMake < 3.21 if: ${{ runner.os == 'Linux' && inputs.recent-cmake == 'false' }} uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2 with: cmake-version: '3.13.x' - - name: Set up CMake >= 3.18 + - name: Set up CMake >= 3.21 if: ${{ runner.os == 'Linux' && inputs.recent-cmake == 'true' }} uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2 with: - cmake-version: '3.18.x' + cmake-version: '3.21.x' - name: Print CMake version run: cmake --version shell: bash diff --git a/.github/workflows/ci-unix-shared-installed.yml b/.github/workflows/ci-unix-shared-installed.yml index 961e9972eb..f2699c08ac 100644 --- a/.github/workflows/ci-unix-shared-installed.yml +++ b/.github/workflows/ci-unix-shared-installed.yml @@ -34,6 +34,7 @@ jobs: gcc-version: ${{ matrix.gcc }} gtest: 'SYSTEM' libyuv: 'SYSTEM' + recent-cmake: 'true' - uses: ./.github/actions/setup-macos if: runner.os == 'macOS' with: