Revert "install Ninja build tool"

This reverts commit 12e6b93.
curl · Oct 16, 2024 · 508d23f · 508d23f
1 parent f28ac6e
commit 508d23f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/_build-runner.sh b/_build-runner.sh
@@ -24,7 +24,7 @@ if [ ! -f .cw-initialized ]; then
   case "$(uname)" in
     *_NT*)
       pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
-        mingw-w64-x86_64-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
+        mingw-w64-x86_64-{clang,cmake,jq,python-pefile,rsync,gettext,osslsigncode} \
         zip
       [[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
       pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
@@ -44,15 +44,15 @@ if [ ! -f .cw-initialized ]; then
         fi
         # shellcheck disable=SC2086
         apt-get --quiet 2 --option Dpkg::Use-Pty=0 --yes install \
-          curl git gpg rsync python3-pefile make cmake ninja-build \
+          curl git gpg rsync python3-pefile make cmake \
           zip xz-utils time jq secure-delete ${extra}
       elif [ "${_DISTRO}" = 'alpine' ]; then
         [[ "${CW_CONFIG:-}" = *'boringssl'* ]] && extra+=' go nasm'
         if [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
           apk add --no-cache checksec-rs --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing/
         fi
         # shellcheck disable=SC2086
-        apk add --no-cache curl git gpg rsync build-base cmake ninja-build \
+        apk add --no-cache curl git gpg rsync build-base cmake \
           zip tar xz jq openssl ${extra}
       fi
       ;;
@@ -61,7 +61,7 @@ if [ ! -f .cw-initialized ]; then
       [[ "${CW_CONFIG:-}" = *'linux'* ]] && extra+=' filosottile/musl-cross/musl-cross'
       # shellcheck disable=SC2086
       brew install \
-        xz gnu-tar gettext jq ninja ${extra}
+        xz gnu-tar gettext jq ${extra}
       ;;
   esac
   touch .cw-initialized

diff --git a/_ci-linux-alpine.sh b/_ci-linux-alpine.sh
@@ -35,7 +35,7 @@ fi
 
 # https://pkgs.alpinelinux.org/packages
 # shellcheck disable=SC2086
-apk add --no-cache curl git gpg gpg-agent rsync build-base cmake samurai python3 \
+apk add --no-cache curl git gpg gpg-agent rsync build-base cmake python3 \
   zip tar xz jq openssl sed ${extra}
 
 ./_build.sh
diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh
@@ -103,7 +103,7 @@ fi
 apt-get --option Dpkg::Use-Pty=0 --yes update
 # shellcheck disable=SC2086
 apt-get --option Dpkg::Use-Pty=0 --yes install \
-  curl git gpg gpg-agent rsync python3-pefile make cmake ninja-build \
+  curl git gpg gpg-agent rsync python3-pefile make cmake \
   libssl-dev zlib1g-dev \
   zip xz-utils time jq secure-delete ${extra}
 

diff --git a/_ci-mac-homebrew.sh b/_ci-mac-homebrew.sh
@@ -6,7 +6,7 @@
 # shellcheck disable=SC3040,SC2039
 set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail
 
-extra='ninja'
+extra=''
 [[ "${CW_CONFIG:-}" = *'boringssl'* ]] && extra+=' go'
 if [[ "${CW_CONFIG:-}" != *'mac'* ]] || [[ "${CW_CONFIG:-}" = *'llvm'* ]]; then
   extra+=' llvm lld'

diff --git a/_ci-win-msys2.sh b/_ci-win-msys2.sh
@@ -8,7 +8,7 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
 pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
 pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
 pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
-  mingw-w64-{x86_64,i686}-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
+  mingw-w64-{x86_64,i686}-{clang,cmake,jq,python-pefile,rsync,gettext,osslsigncode} \
   zip
 
 [[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \