Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
# run this workflow on pull_request activity
# this includes opening and pushing more commits
pull_request:
branches: [ master, 3.24.x, 3.21.x ]
branches: [ master, 3.27.x, 3.24.x ]

jobs:
unit_tests:
Expand Down
3 changes: 3 additions & 0 deletions tests/static-check/run_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ set -x

n_procs="$(getconf _NPROCESSORS_ONLN)"
use_procs=$((n_procs/2))
if [ "$use_procs" -lt "0" ]; then
use_procs=1
fi

function check_with_gcc() {
# previous runs may have cached configuration based on a different CC
Expand Down
2 changes: 1 addition & 1 deletion tests/valgrind-check/valgrind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ print_ps
# cf-serverd running under valgrind can be really slow to start, let's give it
# some time before we move on and potentially hit the wall if it's actually
# malfunctioning
tries=12 # max 2 minutes
tries=24 # max 4 minutes
while /var/cfengine/bin/cf-net -H $BOOTSTRAP_IP connect | grep Failed; do
tries=$((tries - 1))
if [ $tries -le 0 ]; then
Expand Down
Loading