diff --git a/.github/workflows/quick.yaml b/.github/workflows/quick.yaml index 1229b8ac027..2383244752a 100644 --- a/.github/workflows/quick.yaml +++ b/.github/workflows/quick.yaml @@ -148,7 +148,7 @@ jobs: key: ${{ matrix.os }}-${{ matrix.compiler.CC }}-${{ matrix.layer.nick }} - name: Run build on Linux - run: ./test-builds.sh --verbose ${{ matrix.layer.name }} + run: ./test-builds.sh ${{ matrix.layer.name }} - name: Publish build logs if: success() || failure() @@ -181,7 +181,7 @@ jobs: uses: github/codeql-action/init@v3 - name: Build Squid - run: ./test-builds.sh --verbose ./test-suite/buildtests/layer-02-maximus.opts + run: ./test-builds.sh ./test-suite/buildtests/layer-02-maximus.opts - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml index 20334bdc9ed..4b723140504 100644 --- a/.github/workflows/slow.yaml +++ b/.github/workflows/slow.yaml @@ -72,7 +72,8 @@ jobs: - name: Run test-builds id: test-builds - run: ./test-builds.sh --verbose ${{ matrix.layer.name }} + run: | + ./test-builds.sh ${{ matrix.layer.name }} - name: Publish build logs if: success() || failure() @@ -100,7 +101,6 @@ jobs: - name: Run test-builds id: test-builds run: | - echo "::group::setup output" eval `brew shellenv` PKG_CONFIG_PATH="$HOMEBREW_PREFIX/lib/pkgconfig" PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_PREFIX/opt/openldap/lib/pkgconfig" @@ -128,9 +128,8 @@ jobs: editable=$HOMEBREW_CELLAR/libtool/2.4.7/bin/glibtoolize sed -i.bak 's@ltdl_ac_aux_dir=""@ltdl_ac_aux_dir="../build-aux"@' $editable || true diff -u $editable.bak $editable || true - echo "::endgroup::" - ./test-builds.sh --verbose + ./test-builds.sh - name: Publish build logs if: success() || failure() @@ -177,7 +176,7 @@ jobs: run: | export MAKE=gmake - ./test-builds.sh --verbose + ./test-builds.sh - name: Publish build logs if: success() || failure() diff --git a/test-builds.sh b/test-builds.sh index 2e42652dc81..7f27977cb31 100755 --- a/test-builds.sh +++ b/test-builds.sh @@ -68,12 +68,9 @@ while [ $# -ge 1 ]; do done logtee() { - local layer=$2 case $verbose in yes) - echo "::group::$layer output" # github collapsible section tee $1 - echo "::endgroup::" ;; progress) tee $1 | awk '{printf "."; n++; if (!(n % 80)) print "" } END {print ""}' @@ -114,7 +111,7 @@ buildtest() { # log the result for the outer script to notice echo "buildtest.sh result is $result"; - } 2>&1 | logtee ${log} ${layer} + } 2>&1 | logtee ${log} result=1 # failure by default if grep -q '^buildtest.sh result is 0$' ${log}; then