mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Use Cirrus's new greedy mode for parallelizing builds and tests
This oversubscribes our cores 2x, which testing shows we actually run with at times: speedup is around a third on average for builds, and a bit more than that for testing. Also some light Bashification in ci/build.sh, for consistency.
This commit is contained in:
parent
d8b0ee0853
commit
959de22349
4 changed files with 22 additions and 2 deletions
|
@ -1,15 +1,18 @@
|
|||
#! /usr/bin/env bash
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
|
||||
. ${SCRIPT_DIR}/common.sh
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
# If we're on macOS, use --osx-sysroot to ensure we can find the SDKs from Xcode. This avoids
|
||||
# some problems with Catalina specifically, but it doesn't break anything on Big Sur either.
|
||||
if [ "${CIRRUS_OS}" == "darwin" ]; then
|
||||
if [[ "${CIRRUS_OS}" == "darwin" ]]; then
|
||||
export ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --osx-sysroot=$(xcrun --show-sdk-path)"
|
||||
fi
|
||||
|
||||
if [ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]; then
|
||||
if [[ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]]; then
|
||||
./configure ${ZEEK_CI_CONFIGURE_FLAGS}
|
||||
cd build
|
||||
make -j ${ZEEK_CI_CPUS}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue