Fix missing step names

Skptak · Sep 8, 2023 · 5b9f6e5 · 5b9f6e5
1 parent 72d31af
commit 5b9f6e5
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 28 deletions.
diff --git a/clang-formatting/action.yml b/clang-formatting/action.yml
@@ -118,7 +118,8 @@ runs:
             # Run a git diff to print the formatting differences
             echo -e "::group::${{ env.bashInfo }} Format Difference ${{ env.bashEnd }}"
             git diff --color=always
-            echo -e "::endgroup::${{ env.bashFail }} List of files with formatting errors: ${{ env.bashEnd }}"
+            echo -e "::endgroup::"
+            echo -e "${{ env.bashFail }} List of files with formatting errors: ${{ env.bashEnd }}"
             echo -e "${{ env.bashFail }} "$(git diff --name-only)" ${{ env.bashEnd }} "
             echo -e "${{ env.bashFail }} ${{ env.stepName }} ${{ env.bashEnd }}"
         fi
@@ -134,11 +135,12 @@ runs:
         retention-days: 7
 
     - env:
-        stepName: Formatting Git Patch Info
         bashPass: \033[32;1m
         bashInfo: \033[33;1m
         bashFail: \033[31;1m
         bashEnd:  \033[0
+        stepName: Formatting Git Patch Info
+      name: ${{ env.stepName }}
       if: failure() && ( steps.upload-formatting-patch.outcome == 'success' )
       shell: bash
       run: |

diff --git a/complexity/action.yml b/complexity/action.yml
@@ -38,6 +38,7 @@ runs:
         bashInfo: \033[33;1mINFO -
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0m
+      name: ${{ env.stepName }}
       working-directory: ${{ inputs.path }}
       shell: bash
       run: |

diff --git a/coverage-cop/action.yml b/coverage-cop/action.yml
@@ -21,8 +21,8 @@ runs:
         bashInfo: \033[33;1mINFO -
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0
-      shell: bash
       name: ${{ env.stepName }}
+      shell: bash
       run: |
         # ${{ env.stepName }}
         echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
@@ -45,22 +45,22 @@ runs:
         # Print the received code cov report.
         # TODO: The way it grabs the line/branch coverage is a little complicated
         # I'd like to see if this can be done simpler.
-        echo -e " ${{ env.bashInfo }} Received LCov Report: ${{ inputs.line-coverage-min }} ${{ env.bashEnd}}"
+        echo -e " ${{ env.bashInfo }} Received LCov Report: ${{ inputs.coverage-file }} ${{ env.bashEnd}}"
         lcov --list --rc lcov_branch_coverage=1 ${{ inputs.coverage-file }}
         LINE_COVERAGE=$(lcov --list ${{ inputs.coverage-file }} | tail -n 1 | cut -d '|' -f 2 | sed -n "s/\([^%]*\)%.*/\1/p")
         BRANCH_COVERAGE=$(lcov --rc lcov_branch_coverage=1 --list ${{ inputs.coverage-file }} | tail -n 1 | cut -d '|' -f 4 | sed -n "s/\([^%]*\)%.*/\1/p")
         RESULT=0
 
         # Check Line Coverage
         echo -e " ${{ env.bashInfo }} Required Line Coverage: ${{ inputs.line-coverage-min }} ${{ env.bashEnd}}"
-        echo -e " ${{ env.bashInfo }} Received Line Coverage: $LINE_COVERAGE ${{ env.bashEnd}}"
+        echo -e " ${{ env.bashInfo }} Line Coverage of PR: $LINE_COVERAGE ${{ env.bashEnd}}\n"
         if [[ $(echo "$LINE_COVERAGE < ${{ inputs.line-coverage-min }}" | bc) -ne 0 ]]; then
           echo -e "${{ env.bashFail }} Line Coverage is too low. ${{ env.bashEnd }}"
           RESULT=1
         fi
 
         echo -e " ${{ env.bashInfo }} Required Branch Coverage: ${{ inputs.branch-coverage-min }} ${{ env.bashEnd}}"
-        echo -e " ${{ env.bashInfo }} Received Branch Coverage: $BRANCH_COVERAGE ${{ env.bashEnd}}"
+        echo -e " ${{ env.bashInfo }} Line Coverage of PR: $BRANCH_COVERAGE ${{ env.bashEnd}}"
         if [[ $(echo "$BRANCH_COVERAGE < ${{ inputs.branch-coverage-min }}" | bc) -ne 0 ]]; then
           echo -e "${{ env.bashFail }} Branch Coverage is too low. ${{ env.bashEnd }}"
           RESULT=1
@@ -92,6 +92,7 @@ runs:
         bashInfo: \033[33;1m
         bashFail: \033[31;1m
         bashEnd:  \033[0
+      name: ${{ env.stepName }}
       if: failure() && ( steps.upload-codecov-report.outcome == 'success' )
       shell: bash
       run: |

diff --git a/doxygen/action.yml b/doxygen/action.yml
@@ -31,6 +31,7 @@ runs:
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0m
         stepName: Install Doxygen
+        name: ${{ env.stepName }}
       shell: bash
       run: |
         # ${{ env.stepName }}
@@ -45,6 +46,7 @@ runs:
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0m
         stepName: Verify Doxygen build and Generate ZIP (if specified)
+      name: ${{ env.stepName }}
       working-directory: ${{ inputs.path }}
       shell: bash
       run: |

diff --git a/formatting/action.yml b/formatting/action.yml
@@ -118,7 +118,8 @@ runs:
             # Run a git diff to print the formatting differences
             echo -e "::group::${{ env.bashInfo }} Format Difference ${{ env.bashEnd }}"
             git diff --color=always
-            echo -e "::endgroup::${{ env.bashFail }} List of files with formatting errors: ${{ env.bashEnd }}"
+            echo -e "::endgroup::"
+            echo -e "${{ env.bashFail }} List of files with formatting errors: ${{ env.bashEnd }}"
             echo -e "${{ env.bashFail }} "$(git diff --name-only)" ${{ env.bashEnd }} "
             echo -e "${{ env.bashFail }} ${{ env.stepName }} ${{ env.bashEnd }}"
         fi
@@ -139,6 +140,7 @@ runs:
         bashFail: \033[31;1m
         bashEnd:  \033[0
         stepName: Formatting Git Patch Info
+      name: ${{ env.stepName }}
       if: failure() && ( steps.upload-formatting-patch.outcome == 'success' )
       shell: bash
       run: |

diff --git a/memory_statistics/action.yml b/memory_statistics/action.yml
@@ -32,19 +32,22 @@ runs:
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0m
         stepName: Install ARM GCC
+      name: ${{ env.stepName }}
       shell: bash
       run: |
         # ${{ env.stepName }}
         echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         wget -qO- "${{ inputs.toolchain_link }}" | sudo tar --strip-components=1 -xj -C /usr/local
-        echo -e "::endgroup::${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+        echo -e "::endgroup::"
+        echo -e "::group::${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
 
     - env:
         bashPass: \033[32;1mPASSED -
         bashInfo: \033[33;1mINFO -
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0m
         stepName: Compute File Sizes
+      name: ${{ env.stepName }}
       working-directory: ${{ inputs.path }}
       shell: bash
       run: |
@@ -59,6 +62,7 @@ runs:
         bashFail: \033[31;1mFAILED -
         bashEnd:  \033[0m
         stepName: Check File Size
+      name: ${{ env.stepName }}
       working-directory: ${{ inputs.path }}
       shell: bash
       if: inputs.check_against
@@ -67,10 +71,11 @@ runs:
         echo -e "${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         if cmp "${{ inputs.check_against }}" "${{ inputs.output }}" ; then
           echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
-            exit 0
+          exit 0
         else
-            echo -e "::endgroup::${{ env.bashFail }} ${{ env.stepName }} ${{ env.bashEnd }}"
-            echo -e "${{ env.bashFail }} Sizes of files from provided ${{ inputs.check_against }} are not equal to current file size! ${{ env.bashEnd }}"
-            diff -U 2 "${{ inputs.check_against }}" "${{ inputs.output }}"
-            exit 1
+          echo -e "::endgroup::"
+          echo -e "::group::${{ env.bashFail }} ${{ env.stepName }} ${{ env.bashEnd }}"
+          echo -e "${{ env.bashFail }} Sizes of files from provided ${{ inputs.check_against }} are not equal to current file size! ${{ env.bashEnd }}"
+          diff -U 2 "${{ inputs.check_against }}" "${{ inputs.output }}"
+          exit 1
         fi
diff --git a/set_up_cbmc_runner/action.yml b/set_up_cbmc_runner/action.yml
@@ -31,49 +31,92 @@ runs:
       uses: actions/checkout@v3
       with:
         submodules: 'recursive'
-    - name: Install latest CBMC
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install latest CBMC
+      name: ${{ env.stepName }}
       if: ${{ inputs.cbmc_version == 'latest' }}
       shell: bash
       run: |
-        echo "Using latest CBMC"
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         # Search within 5 most recent releases for latest available package
         CBMC_REL="https://api.github.com/repos/diffblue/cbmc/releases?page=1&per_page=5"
         CBMC_DEB=$(curl -s $CBMC_REL | jq -r '.[].assets[].browser_download_url' | grep -e 'ubuntu-20.04' | head -n 1)
         CBMC_ARTIFACT_NAME=$(basename $CBMC_DEB)
         curl -o $CBMC_ARTIFACT_NAME -L $CBMC_DEB
         sudo dpkg -i $CBMC_ARTIFACT_NAME
         rm ./$CBMC_ARTIFACT_NAME
-    - name: Install CBMC ${{ inputs.cbmc_version }}
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install CBMC ${{ inputs.cbmc_version }}
+      name: ${{ env.stepName }}
       if: ${{ inputs.cbmc_version != 'latest' }}
       shell: bash
       run: |
-        echo "Using CBMC version ${{ inputs.cbmc_version }}"
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         curl -o cbmc.deb -L \
           https://github.com/diffblue/cbmc/releases/download/cbmc-${{ inputs.cbmc_version }}/ubuntu-20.04-cbmc-${{ inputs.cbmc_version }}-Linux.deb
         sudo dpkg -i ./cbmc.deb
         rm ./cbmc.deb
-    - name: Install latest CBMC viewer
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install latest CBMC viewer
+      name: ${{ env.stepName }}
       if: ${{ inputs.cbmc_viewer_version == 'latest' }}
       shell: bash
       run: |
-        echo "Using latest CBMC Viewer"
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         CBMC_VIEWER_REL="https://api.github.com/repos/model-checking/cbmc-viewer/releases/latest"
         CBMC_VIEWER_VERSION=$(curl -s $CBMC_VIEWER_REL | jq -r .name | sed  's/viewer-//')
         pip3 install cbmc-viewer==$CBMC_VIEWER_VERSION
-    - name: Install CBMC viewer ${{ inputs.cbmc_viewer_version }}
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install CBMC viewer ${{ inputs.cbmc_viewer_version }}
+      name: ${{ env.stepName }}
       if: ${{ inputs.cbmc_viewer_version != 'latest' }}
       shell: bash
       run: |
-        echo "Using CBMC Viewer version ${{ inputs.cbmc_version }}"
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         sudo apt-get update
         sudo apt-get install --no-install-recommends --yes \
           build-essential universal-ctags
         pip3 install cbmc-viewer==${{ inputs.cbmc_viewer_version }}
-    - name: Install latest Litani
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install latest Litani
+      name: ${{ env.stepName }}
       if: ${{ inputs.litani_version == 'latest' }}
       shell: bash
       run: |
-        echo "Using latest Litani"
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         # Search within 5 most recent releases for latest available package
         LITANI_REL="https://api.github.com/repos/awslabs/aws-build-accumulator/releases?page=1&per_page=5"
         LITANI_DEB=$(curl -s $LITANI_REL | jq -r '.[].assets[0].browser_download_url' | head -n 1)
@@ -82,20 +125,39 @@ runs:
         sudo apt-get update
         sudo apt-get install --no-install-recommends --yes ./$DBN_PKG_FILENAME
         rm ./$DBN_PKG_FILENAME
-    - name: Install Litani ${{ inputs.litani_version }}
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install Litani ${{ inputs.litani_version }}
+      name: ${{ env.stepName }}
       if: ${{ inputs.litani_version != 'latest' }}
       shell: bash
       run: |
-        echo "Using Litani version ${{ inputs.cbmc_version }}"
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         curl -o litani.deb -L \
           https://github.com/awslabs/aws-build-accumulator/releases/download/${{ inputs.litani_version }}/litani-${{ inputs.litani_version }}.deb
         sudo apt-get update
         sudo apt-get install --no-install-recommends --yes ./litani.deb
         rm ./litani.deb
-    - name: Install ${{ inputs.kissat_tag }} kissat
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install ${{ inputs.kissat_tag }} kissat
+      name: ${{ env.stepName }}
       if: ${{ inputs.kissat_tag != '' }}
       shell: bash
       run: |
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         if ${{ inputs.kissat_tag == '' }}; then return 0; fi
         if ${{ inputs.kissat_tag == 'latest' }}
         then
@@ -112,10 +174,20 @@ runs:
           && cd build \
           && make -j;
         echo "$(pwd)" >> $GITHUB_PATH
-    - name: Install ${{ inputs.cadical_tag }} cadical
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+    - env:
+        bashPass: \033[32;1mPASSED -
+        bashInfo: \033[33;1mINFO -
+        bashFail: \033[31;1mFAILED -
+        bashEnd:  \033[0m
+        stepName: Install ${{ inputs.cadical_tag }} cadical
+      name: ${{ env.stepName }}
       if: ${{ inputs.cadical_tag != '' }}
       shell: bash
       run: |
+        # ${{ env.stepName }}
+        echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
         if ${{ inputs.cadical_tag == '' }}; then return 0; fi
         if ${{ inputs.cadical_tag == 'latest' }}
         then
@@ -132,3 +204,4 @@ runs:
           && cd build \
           && make -j;
         echo "$(pwd)" >> $GITHUB_PATH
+        echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
diff --git a/spellings/action.yml b/spellings/action.yml
@@ -72,7 +72,7 @@ runs:
     shell: bash
     run: |
       # ${{ env.stepName }}
-      echo -e "::group:${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
+      echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
       export PATH="$GITHUB_ACTION_PATH:$PATH"
       exitStatus=0