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

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

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index c77e62de4..cd051da55 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 }} \
@@ -30,18 +32,26 @@ runs:
             libseccomp-dev \
             libselinux1-dev
 
+        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 LXC"
+
         # Standard build
         if [ "${{ inputs.variant }}" = "default" ]; then
             meson setup build \
@@ -65,3 +75,5 @@ runs:
         fi
 
         meson compile -C build
+
+        echo "::endgroup::"
diff --git a/.github/actions/testsuite/action.yml b/.github/actions/testsuite/action.yml
index 2c5f7aa59..928024d64 100644
--- a/.github/actions/testsuite/action.yml
+++ b/.github/actions/testsuite/action.yml
@@ -10,7 +10,8 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: ./.github/actions/build
+    - name: Build LXC
+      uses: ./.github/actions/build
       with:
         compiler: ${{ inputs.compiler }}
         os: ${{ inputs.os }}
@@ -19,15 +20,21 @@ runs:
     - name: Remove existing installation
       shell: bash
       run: |
+        echo "::group::Removing existing installation"
+
         sudo apt-get remove --purge -qq \
             liblxc1 \
             liblxc-common \
             liblxc-dev \
             lxc-utils
 
+        echo "::endgroup::"
+
     - name: Install dependencies
       shell: bash
       run: |
+        echo "::group::Installing dependencies"
+
         sudo apt-get install --purge -qq \
             apparmor \
             acl \
@@ -37,11 +44,15 @@ runs:
             rsync \
             uidmap
 
+        echo "::endgroup::"
+
     - name: Test
       shell: bash
       env:
         CC: ${{ inputs.compiler }}
       run: |
+        echo "::group::Running the testsuite"
+
         # Install LXC on the system
         sudo meson install -C build
 
@@ -67,3 +78,5 @@ runs:
         # Run the testsuite
         git clone --depth=1 https://github.com/lxc/lxc-ci
         sudo -E lxc-ci/deps/lxc-exercise
+
+        echo "::endgroup::"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fb27c03bc..f5b935465 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,7 +53,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 }}
           os: ${{ matrix.os }}
@@ -83,7 +84,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 }}
           os: ${{ matrix.os }}
-- 
2.47.2