Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Revert recent "show build commands on terminal" change #2000

Closed
wants to merge 4 commits into from
Closed

CI: Revert recent "show build commands on terminal" change #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44cc963
Remove grouping
kinkie Feb 20, 2025
14752d4
Add verbose flag to openbsd
kinkie Feb 20, 2025
52ac5fe
Remove verbose flag from builds
kinkie Feb 21, 2025
620f4bf
fixup: Finish reverting e5a66fc2 (as advertised)
rousskov Feb 21, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/quick.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
9 changes: 4 additions & 5 deletions .github/workflows/slow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -177,7 +176,7 @@ jobs:

run: |
export MAKE=gmake
./test-builds.sh --verbose
./test-builds.sh

- name: Publish build logs
if: success() || failure()
Expand Down
5 changes: 1 addition & 4 deletions test-builds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""}'
Expand Down Expand Up @@ -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
Expand Down