Skip to content

Commit 508d23f

Browse files
committed
Revert "install Ninja build tool"
This reverts commit 12e6b93.
1 parent f28ac6e commit 508d23f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

_build-runner.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ ! -f .cw-initialized ]; then
2424
case "$(uname)" in
2525
*_NT*)
2626
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
27-
mingw-w64-x86_64-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
27+
mingw-w64-x86_64-{clang,cmake,jq,python-pefile,rsync,gettext,osslsigncode} \
2828
zip
2929
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
3030
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
@@ -44,15 +44,15 @@ if [ ! -f .cw-initialized ]; then
4444
fi
4545
# shellcheck disable=SC2086
4646
apt-get --quiet 2 --option Dpkg::Use-Pty=0 --yes install \
47-
curl git gpg rsync python3-pefile make cmake ninja-build \
47+
curl git gpg rsync python3-pefile make cmake \
4848
zip xz-utils time jq secure-delete ${extra}
4949
elif [ "${_DISTRO}" = 'alpine' ]; then
5050
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && extra+=' go nasm'
5151
if [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
5252
apk add --no-cache checksec-rs --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing/
5353
fi
5454
# shellcheck disable=SC2086
55-
apk add --no-cache curl git gpg rsync build-base cmake ninja-build \
55+
apk add --no-cache curl git gpg rsync build-base cmake \
5656
zip tar xz jq openssl ${extra}
5757
fi
5858
;;
@@ -61,7 +61,7 @@ if [ ! -f .cw-initialized ]; then
6161
[[ "${CW_CONFIG:-}" = *'linux'* ]] && extra+=' filosottile/musl-cross/musl-cross'
6262
# shellcheck disable=SC2086
6363
brew install \
64-
xz gnu-tar gettext jq ninja ${extra}
64+
xz gnu-tar gettext jq ${extra}
6565
;;
6666
esac
6767
touch .cw-initialized

_ci-linux-alpine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fi
3535

3636
# https://pkgs.alpinelinux.org/packages
3737
# shellcheck disable=SC2086
38-
apk add --no-cache curl git gpg gpg-agent rsync build-base cmake samurai python3 \
38+
apk add --no-cache curl git gpg gpg-agent rsync build-base cmake python3 \
3939
zip tar xz jq openssl sed ${extra}
4040

4141
./_build.sh

_ci-linux-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fi
103103
apt-get --option Dpkg::Use-Pty=0 --yes update
104104
# shellcheck disable=SC2086
105105
apt-get --option Dpkg::Use-Pty=0 --yes install \
106-
curl git gpg gpg-agent rsync python3-pefile make cmake ninja-build \
106+
curl git gpg gpg-agent rsync python3-pefile make cmake \
107107
libssl-dev zlib1g-dev \
108108
zip xz-utils time jq secure-delete ${extra}
109109

_ci-mac-homebrew.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# shellcheck disable=SC3040,SC2039
77
set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail
88

9-
extra='ninja'
9+
extra=''
1010
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && extra+=' go'
1111
if [[ "${CW_CONFIG:-}" != *'mac'* ]] || [[ "${CW_CONFIG:-}" = *'llvm'* ]]; then
1212
extra+=' llvm lld'

_ci-win-msys2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
88
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
99
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
1010
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
11-
mingw-w64-{x86_64,i686}-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
11+
mingw-w64-{x86_64,i686}-{clang,cmake,jq,python-pefile,rsync,gettext,osslsigncode} \
1212
zip
1313

1414
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \

0 commit comments

Comments
 (0)