diff --git a/.github/workflows/android-linux.yml b/.github/workflows/android-linux.yml index be85b07fd79..e931308c1a5 100644 --- a/.github/workflows/android-linux.yml +++ b/.github/workflows/android-linux.yml @@ -56,6 +56,7 @@ jobs: fetch-depth: 0 - uses: seanmiddleditch/gha-setup-ninja@v5 + - uses: lukka/get-cmake@latest - name: Install CCache run: | diff --git a/.github/workflows/android-macos.yml b/.github/workflows/android-macos.yml index f2616117451..841560402f6 100644 --- a/.github/workflows/android-macos.yml +++ b/.github/workflows/android-macos.yml @@ -34,6 +34,7 @@ jobs: fetch-depth: 0 - uses: seanmiddleditch/gha-setup-ninja@v5 + - uses: lukka/get-cmake@latest - name: Install Dependencies run: | diff --git a/.github/workflows/android-windows.yml b/.github/workflows/android-windows.yml index 4851c202559..d237fbea70b 100644 --- a/.github/workflows/android-windows.yml +++ b/.github/workflows/android-windows.yml @@ -50,11 +50,7 @@ jobs: fetch-depth: 0 - uses: seanmiddleditch/gha-setup-ninja@v5 - - - name: Install Dependencies - run: | - choco install --no-progress ninja pkgconfiglite -y - choco install --no-progress cmake --installargs 'ADD_CMAKE_TO_PATH=System' --apply-install-arguments-to-dependencies + - uses: lukka/get-cmake@latest # - name: Set Up sccache # uses: mozilla-actions/sccache-action@v0.0.5 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index b0f4f0d7f32..ddb19719d75 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -54,6 +54,9 @@ jobs: brew update brew install cmake ninja ccache + - uses: seanmiddleditch/gha-setup-ninja@v5 + - uses: lukka/get-cmake@latest + - name: Set Up Cache uses: hendrikmuhs/ccache-action@v1.2 with: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 222dfaa6442..0f8b5f00c9e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -160,7 +160,6 @@ jobs: # -Dgst-plugins-ugly:x264=enabled - uses: lukka/get-cmake@latest - - uses: seanmiddleditch/gha-setup-ninja@v5 - run: mkdir ${{ runner.temp }}/shadow_build_dir diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0fa99a0db16..1345b07aaca 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -59,6 +59,9 @@ jobs: brew install cmake ninja ccache geographiclib SDL2 exiv2 expat zlib shapelib pkgconf create-dmg continue-on-error: true + - uses: lukka/get-cmake@latest + - uses: seanmiddleditch/gha-setup-ninja@v5 + - name: Install Gstreamer run: | wget --quiet https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.GST_VERSION }}/gstreamer-1.0-devel-${{ env.GST_VERSION }}-universal.pkg diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c8eaa9331ef..156f1687c16 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -49,11 +49,7 @@ jobs: fetch-depth: 0 - uses: seanmiddleditch/gha-setup-ninja@v5 - - - name: Install Dependencies - run: | - choco install --no-progress ninja pkgconfiglite -y - choco install --no-progress cmake --installargs 'ADD_CMAKE_TO_PATH=System' --apply-install-arguments-to-dependencies + - uses: lukka/get-cmake@latest - name: Install Vulkan working-directory: ${{ runner.temp }}