CI: Switch from bash to POSIX shell.

Same as in libpcap.
This commit is contained in:
Denis Ovsienko 2021-07-05 11:59:03 +01:00
parent 59ddbc3fd4
commit 63ea6b5d47
3 changed files with 12 additions and 19 deletions

View File

@ -24,7 +24,7 @@ freebsd_task:
MATRIX_CC: clang gcc10 MATRIX_CC: clang gcc10
script: script:
- pkg install -qy git autoconf gcc10 - pkg install -qy git autoconf gcc10
- pkg install -qy bash cmake # for build_matrix.sh and build.sh - pkg install -qy cmake # for build_matrix.sh and build.sh
- pkg install -qy pkgconf # for cmake, replaces pkg-config - pkg install -qy pkgconf # for cmake, replaces pkg-config
- echo '$ git clone [...] libpcap.git' - echo '$ git clone [...] libpcap.git'
- git -C .. clone --depth ${CIRRUS_CLONE_DEPTH} --branch=master --quiet ${LIBPCAP_GIT} - git -C .. clone --depth ${CIRRUS_CLONE_DEPTH} --branch=master --quiet ${LIBPCAP_GIT}

View File

@ -1,11 +1,9 @@
#!/usr/bin/env bash #!/bin/sh -e
# This script runs one build with setup environment variables: BUILD_LIBPCAP, # This script runs one build with setup environment variables: BUILD_LIBPCAP,
# REMOTE, CC, CMAKE, CRYPTO and SMB # REMOTE, CC, CMAKE, CRYPTO and SMB
# (default: BUILD_LIBPCAP=no, REMOTE=no, CC=gcc, CMAKE=no, CRYPTO=no, SMB=no). # (default: BUILD_LIBPCAP=no, REMOTE=no, CC=gcc, CMAKE=no, CRYPTO=no, SMB=no).
set -e
# BUILD_LIBPCAP: no or yes # BUILD_LIBPCAP: no or yes
BUILD_LIBPCAP=${BUILD_LIBPCAP:-no} BUILD_LIBPCAP=${BUILD_LIBPCAP:-no}
# REMOTE: no or yes # REMOTE: no or yes
@ -30,16 +28,16 @@ fi
export TCPDUMP_BIN="$PREFIX/bin/tcpdump" export TCPDUMP_BIN="$PREFIX/bin/tcpdump"
travis_fold() { travis_fold() {
local action=${1:?} tf_action=${1:?}
local name=${2:?} tf_name=${2:?}
if [ "$TRAVIS" != true ]; then return; fi if [ "$TRAVIS" != true ]; then return; fi
echo -ne "travis_fold:$action:$LABEL.script.$name\\r" printf 'travis_fold:%s:%s.script.%s\r' "$tf_action" "$LABEL" "$tf_name"
sleep 1 sleep 1
} }
# Run a command after displaying it # Run a command after displaying it
run_after_echo() { run_after_echo() {
echo -n '$ ' printf '$ '
echo "$@" echo "$@"
# shellcheck disable=SC2068 # shellcheck disable=SC2068
$@ $@

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/bin/sh -e
# This script executes the matrix loops, exclude tests and cleaning. # This script executes the matrix loops, exclude tests and cleaning.
# It calls the build.sh script which runs one build with setup environment # It calls the build.sh script which runs one build with setup environment
@ -11,11 +11,6 @@
# MATRIX_CC='gcc clang', MATRIX_CMAKE='no yes', MATRIX_CRYPTO='no yes', # MATRIX_CC='gcc clang', MATRIX_CMAKE='no yes', MATRIX_CRYPTO='no yes',
# MATRIX_SMB='no yes'). # MATRIX_SMB='no yes').
set -e
# ANSI color escape sequences
ANSI_MAGENTA="\\033[35;1m"
ANSI_RESET="\\033[0m"
uname -a uname -a
date date
# Install directory prefix # Install directory prefix
@ -27,18 +22,18 @@ fi
COUNT=0 COUNT=0
travis_fold() { travis_fold() {
local action=${1:?} tf_action=${1:?}
local name=${2:?} tf_name=${2:?}
if [ "$TRAVIS" != true ]; then return; fi if [ "$TRAVIS" != true ]; then return; fi
echo -ne "travis_fold:$action:$LABEL.script.$name\\r" printf 'travis_fold:%s:%s.script.%s\r' "$tf_action" "$LABEL" "$tf_name"
sleep 1 sleep 1
} }
# Display text in magenta # Display text in magenta
echo_magenta() { echo_magenta() {
echo -ne "$ANSI_MAGENTA" printf '\033[35;1m' # ANSI magenta
echo "$@" echo "$@"
echo -ne "$ANSI_RESET" printf '\033[0m' # ANSI reset
} }
build_tcpdump() { build_tcpdump() {