diff --git a/.cirrus.yml b/.cirrus.yml index 7d20f563..396bea48 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -147,7 +147,7 @@ task: - | case "${DIST}" in ALPINE) - apk add cmake samurai gtest-dev autoconf autoconf-archive automake libtool pkgconf make + apk add bash cmake samurai gtest-dev autoconf autoconf-archive automake libtool pkgconf make case "${BUILD_TYPE}" in asan|lsan|ubsan) apk add clang17 compiler-rt @@ -185,7 +185,8 @@ task: ;; FREEBSD) # pkg upgrade -y && \ - pkg install -y cmake ninja googletest pkgconf + pkg install -y bash cmake ninja googletest pkgconf + ln -sf /usr/local/bin/bash /bin/bash case "${BUILD_TYPE}" in asan|analyze|ubsan|lsan) pkg install -y llvm autoconf automake libtool gmake diff --git a/.github/workflows/netbsd.yml b/.github/workflows/netbsd.yml index 9ca471f1..ca3dc9e0 100644 --- a/.github/workflows/netbsd.yml +++ b/.github/workflows/netbsd.yml @@ -31,7 +31,8 @@ jobs: echo "CMAKE_FLAGS: $CMAKE_FLAGS" echo "CMAKE_TEST_FLAGS: $CMAKE_TEST_FLAGS" echo "PKG_PATH: $PKG_PATH" - sudo -E /usr/pkg/sbin/pkg_add -u cmake googletest pkgconf ninja-build + sudo -E /usr/pkg/sbin/pkg_add -u bash cmake googletest pkgconf ninja-build gdb + sudo ln -sf /usr/pkg/bin/bash /bin/bash ./ci/build.sh ./ci/test.sh diff --git a/.github/workflows/openbsd.yml b/.github/workflows/openbsd.yml index 10336253..f1a23eb0 100644 --- a/.github/workflows/openbsd.yml +++ b/.github/workflows/openbsd.yml @@ -24,7 +24,8 @@ jobs: shell: 'bash' environment_variables: DIST BUILD_TYPE CMAKE_FLAGS CMAKE_TEST_FLAGS run: | - sudo pkg_add cmake gtest pkgconf ninja + sudo pkg_add bash cmake gtest pkgconf ninja gdb lldb + sudo ln -sf /usr/local/bin/bash /bin/bash echo "BUILD_TYPE: $BUILD_TYPE" echo "CMAKE_FLAGS: $CMAKE_FLAGS" echo "CMAKE_TEST_FLAGS: $CMAKE_TEST_FLAGS" diff --git a/ci/build.sh b/ci/build.sh index e4e9f771..04976d5a 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -29,6 +29,7 @@ if [ "$BUILD_TYPE" = "autotools" -o "$BUILD_TYPE" = "coverage" ]; then export CXXFLAGS="${CXXFLAGS} -O0 -g" $SCAN_WRAP ../configure --disable-symbol-hiding --enable-maintainer-mode $CONFIG_OPTS $SCAN_WRAP make + cd .. else # Use cmake for everything else rm -rf cmakebld @@ -39,4 +40,5 @@ else fi $SCAN_WRAP cmake ${CMAKE_FLAGS} ${CMAKE_TEST_FLAGS} .. $SCAN_WRAP cmake --build . + cd .. fi diff --git a/ci/test.sh b/ci/test.sh index 3dd6c166..938adee4 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) The c-ares project and its contributors # SPDX-License-Identifier: MIT set -e -x -o pipefail