From fb93b0f133fc5897a879142a88aa63373f43b6ff Mon Sep 17 00:00:00 2001
From: Alexander Popov <alex.popov@linux.com>
Date: Wed, 10 May 2023 01:18:14 +0300
Subject: [PATCH] Fix CI output style and move `pip install coverage` to the
 proper place

---
 .github/workflows/functional_test.yml | 11 ++++++-----
 .woodpecker/functional_test.yml       |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/functional_test.yml b/.github/workflows/functional_test.yml
index 90324f2..5e8c181 100644
--- a/.github/workflows/functional_test.yml
+++ b/.github/workflows/functional_test.yml
@@ -28,30 +28,31 @@ jobs:
     - name: Install package
       run: |
         python -m pip install --upgrade pip
-        pip install coverage
+        echo "Install the package via pip..."
         pip --verbose install git+https://github.com/a13xp0p0v/kconfig-hardened-check
-        echo ">>>>> first start <<<<<"
+        echo "Run the installed tool..."
         kconfig-hardened-check
 
     - name: Check all configs with the installed tool
       run: |
-        echo ">>>>> check all configs <<<<<"
+        echo "Check all configs with the installed tool..."
         CONFIG_DIR=`find /opt/hostedtoolcache/Python/ -name config_files`
         KCONFIGS=`find $CONFIG_DIR -type f | grep -e "\.config" -e "\.gz"`
         COUNT=0
         for C in $KCONFIGS
         do
                 COUNT=$(expr $COUNT + 1)
-                echo -e "\n>>>>> checking config number $COUNT <<<<<"
+                echo -e "\n>>>>> checking kconfig number $COUNT <<<<<"
                 kconfig-hardened-check -c $C -l /proc/cmdline
         done
-        echo -e "\n>>>>> checking $COUNT configs is done <<<<<"
+        echo -e "\nHave checked $COUNT kconfigs"
 
     - name: Get source code for collecting coverage
       uses: actions/checkout@v3
 
     - name: Run the functional tests and collect the coverage
       run: |
+        pip install coverage
         sh .github/workflows/functional_test.sh
 
     - name: Prepare final coverage report
diff --git a/.woodpecker/functional_test.yml b/.woodpecker/functional_test.yml
index a41068e..7f70328 100644
--- a/.woodpecker/functional_test.yml
+++ b/.woodpecker/functional_test.yml
@@ -19,7 +19,7 @@ pipeline:
       - KCONFIGS=`find $CONFIG_DIR -type f | grep -e "\.config" -e "\.gz"`
       - COUNT=0
       - for C in $KCONFIGS; do COUNT=$(expr $COUNT + 1); echo ">>>>> checking kconfig number $COUNT <<<<<"; kconfig-hardened-check -c $C -l /proc/cmdline; done
-      - echo ">>>>> have checked $COUNT kconfigs <<<<<"
+      - echo "Have checked $COUNT kconfigs"
   functional-test-with-coverage:
     image: python:3
     pull: true
@@ -29,4 +29,5 @@ pipeline:
       - pip install --no-cache-dir coverage
       - echo "Run the functional tests and collect the coverage..."
       - sh .github/workflows/functional_test.sh
+      - echo "Show the coverage report..."
       - coverage report
-- 
2.31.1