From: Martin Storsjö <martin@martin.st>
Date: Tue, 10 Jun 2025 10:55:00 +0000 (+0300)
Subject: ci: Stop manually installing Ninja on Linux and macOS
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3a19032a2e4573f9b403e0f034317b2f4bc1843e;p=thirdparty%2Fccache.git

ci: Stop manually installing Ninja on Linux and macOS

Since https://github.com/actions/runner-images/pull/11706,
https://github.com/actions/runner-images/pull/11707 and
https://github.com/actions/runner-images/pull/11737, ninja is
preinstalled in the Ubuntu, macOS and x86 Windows runner images.
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f08d99fc..6cc7c16f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -84,7 +84,6 @@ jobs:
             elfutils
             libhiredis-dev
             libzstd-dev
-            ninja-build
             python3
             redis-server
             redis-tools
@@ -137,7 +136,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 \
-            brew install ninja hiredis redis
+            brew install hiredis redis
 
           if [ "${{ matrix.compiler }}" = "gcc" ]; then
             brew install gcc@${{ matrix.version }}
@@ -247,10 +246,6 @@ jobs:
     steps:
       - name: Get source
         uses: actions/checkout@v4
-      - name: Install Dependencies
-        run: |
-          HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 \
-              brew install ninja
       - name: Build macOS universal binary
         run: ci/build-macos-binary
       - name: Archive universal binary
@@ -377,14 +372,14 @@ jobs:
             CXX: g++
             SPECIAL: build-and-verify-package
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=Release
-            apt_get: elfutils libzstd-dev libhiredis-dev ninja-build
+            apt_get: elfutils libzstd-dev libhiredis-dev
 
           - name: Source package
             os: ubuntu-22.04
             CC: gcc
             CXX: g++
             SPECIAL: build-and-verify-source-package
-            apt_get: elfutils libzstd-dev libhiredis-dev ninja-build asciidoctor
+            apt_get: elfutils libzstd-dev libhiredis-dev asciidoctor
 
           - name: HTML documentation
             os: ubuntu-22.04