From 97cb9a6b1334b2ded6c57ebe281feb9ce716a21c Mon Sep 17 00:00:00 2001
From: Prasanna Loganathar <pvl@prasannavl.com>
Date: Thu, 27 Jul 2023 22:12:03 +0800
Subject: [PATCH] Add CI fold control, reduce line groupings

---
 .github/workflows/tests.yaml |  2 +-
 make.sh                      | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 86b91774dfd..bba2392d44a 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -22,7 +22,7 @@ jobs:
     env:
       GITHUB_PULL_REQUEST: ${{ github.event.number }}
       TESTS_FAILFAST: 1
-      TESTS_COMBINED_LOGS: 10000
+      TESTS_COMBINED_LOGS: 500
     steps:
     - name: Checkout base branch and/or merge
       if: github.event_name != 'pull_request'
diff --git a/make.sh b/make.sh
index 7c20971760c..66251d0c749 100755
--- a/make.sh
+++ b/make.sh
@@ -63,6 +63,7 @@ setup_vars() {
     MAKE_DEPS_ARGS=${MAKE_DEPS_ARGS:-}
     TESTS_FAILFAST=${TESTS_FAILFAST:-"0"}
     TESTS_COMBINED_LOGS=${TESTS_COMBINED_LOGS:-"0"}
+    CI_GROUP_LOGS=${CI_GROUP_LOGS:-"1"}
 }
 
 main() {
@@ -384,7 +385,6 @@ test_py() {
     fi
 
     _ensure_enter_dir "${build_target_dir}"
-
     py_ensure_env_active
 
     # shellcheck disable=SC2086
@@ -1053,11 +1053,15 @@ _safe_rm_rf() {
 }
 
 _fold_start() {
-    echo "::group::${*:-}"
+    if [[ "${CI_GROUP_LOGS}" == "1" ]]; then
+        echo "::group::${*:-}";
+    fi
 }
 
 _fold_end() {
-    echo "::endgroup::"
+    if [[ "${CI_GROUP_LOGS}" == "1" ]]; then
+        echo "::endgroup::"
+    fi
 }
 
 _ensure_enter_dir() {