Skip to content

Commit

Permalink
install ninja
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Oct 16, 2024
1 parent 401918f commit 41c8187
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions _build-runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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,jq,python-pefile,rsync,gettext,osslsigncode} \
mingw-w64-x86_64-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
zip
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
Expand All @@ -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 \
curl git gpg rsync python3-pefile make cmake ninja-build \
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 \
apk add --no-cache curl git gpg rsync build-base cmake ninja-build \
zip tar xz jq openssl ${extra}
fi
;;
Expand All @@ -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 ${extra}
xz gnu-tar gettext jq ninja ${extra}
;;
esac
touch .cw-initialized
Expand Down
2 changes: 1 addition & 1 deletion _ci-linux-alpine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 python3 \
apk add --no-cache curl git gpg gpg-agent rsync build-base cmake ninja-build python3 \
zip tar xz jq openssl sed ${extra}

./_build.sh
2 changes: 1 addition & 1 deletion _ci-linux-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
curl git gpg gpg-agent rsync python3-pefile make cmake ninja-build \
libssl-dev zlib1g-dev \
zip xz-utils time jq secure-delete ${extra}

Expand Down
2 changes: 1 addition & 1 deletion _ci-mac-homebrew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# shellcheck disable=SC3040,SC2039
set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail

extra=''
extra='ninja'
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && extra+=' go'
if [[ "${CW_CONFIG:-}" != *'mac'* ]] || [[ "${CW_CONFIG:-}" != *'gcc'* ]]; then
extra+=' llvm lld'
Expand Down
2 changes: 1 addition & 1 deletion _ci-win-msys2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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,jq,python-pefile,rsync,gettext,osslsigncode} \
mingw-w64-{x86_64,i686}-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
zip

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

0 comments on commit 41c8187

Please sign in to comment.