From e19939c56416f5a62a0a0d66c8fab0cc91099702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Wed, 18 Dec 2024 22:55:57 -0500
Subject: [PATCH] github: Improve progress reporting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
 .github/actions/build/action.yml     | 12 ++++++++++++
 .github/actions/testsuite/action.yml |  7 ++++++-
 .github/workflows/tests.yml          |  9 ++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index d81764c0..8b05c2c7 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -14,6 +14,8 @@ runs:
     - name: Install dependencies
       shell: bash
       run: |
+        echo "::group::Installing dependencies"
+
         sudo apt-get update -qq
         sudo apt-get install -qq \
             ${{ inputs.compiler }} \
@@ -22,18 +24,26 @@ runs:
             pkg-config \
             uuid-runtime
 
+        echo "::endgroup::"
+
     - name: Compiler version
       shell: bash
       env:
         CC: ${{ inputs.compiler }}
       run: |
+        echo "::group::Compiler version"
+
         ${CC} --version
 
+        echo "::endgroup::"
+
     - name: Build
       shell: bash
       env:
         CC: ${{ inputs.compiler }}
       run: |
+        echo "::group::Building LXCFS"
+
         # Standard build
         meson setup build \
             -Ddocs=false \
@@ -42,3 +52,5 @@ runs:
             -Dprefix=/usr \
             -Db_sanitize=address,undefined
         meson compile -C build
+
+        echo "::endgroup::"
diff --git a/.github/actions/testsuite/action.yml b/.github/actions/testsuite/action.yml
index d462201f..499fbfe6 100644
--- a/.github/actions/testsuite/action.yml
+++ b/.github/actions/testsuite/action.yml
@@ -11,7 +11,8 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: ./.github/actions/build
+    - name: Build LXCFS
+      uses: ./.github/actions/build
       with:
         compiler: ${{ inputs.compiler }}
         fuse: ${{ inputs.fuse }}
@@ -22,5 +23,9 @@ runs:
       env:
         CC: ${{ inputs.compiler }}
       run: |
+        echo "::group::Running the testsuite"
+
         echo 1 | sudo tee /sys/fs/cgroup/cpuset/cgroup.clone_children || true
         sudo -E PATH="${PATH}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" build/tests/main.sh
+
+        echo "::endgroup::"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b1bc9d7a..4d47488a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: ./.github/actions/testsuite
+      - name: Run the testsuite
+        uses: ./.github/actions/testsuite
         with:
           compiler: ${{ matrix.compiler }}
           fuse: ${{ matrix.fuse }}
@@ -57,7 +58,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: ./.github/actions/testsuite
+      - name: Run the testsuite
+        uses: ./.github/actions/testsuite
         with:
           compiler: ${{ matrix.compiler }}
           fuse: ${{ matrix.fuse }}
@@ -79,7 +81,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: ./.github/actions/build
+      - name: Build LXCFS
+        uses: ./.github/actions/build
         with:
           compiler: ${{ matrix.compiler }}
           fuse: ${{ matrix.fuse }}