Merge pull request #1476 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev16
nasa · Aug 22, 2024 · 8270166 · 8270166
2 parents d6412df + c2ad558
commit 8270166
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/.github/workflows/standalone-build.yml b/.github/workflows/standalone-build.yml
@@ -34,7 +34,7 @@ jobs:
           path: source
 
       - name: Install Coverage Analysis Tools
-        if: ${{ matrix.build-type == 'Debug' && matrix.base-os == 'ubuntu-20.04' }}
+        if: ${{ matrix.build-type == 'Debug' }}
         run: sudo apt-get install -y lcov xsltproc && echo "run_lcov=TRUE" >> $GITHUB_ENV
 
       - name: Set up debug environment
@@ -89,23 +89,44 @@ jobs:
           binary-dir: build
 
       - name: Enforce coverage function minimum
-        if: ${{ always() && steps.stats.outputs.ncov_functions > env.allowed_ncov_functions }}
+        if: ${{ env.run_lcov == 'TRUE' && always() && steps.stats.outputs.ncov_functions > env.allowed_ncov_functions }}
         run: |
           echo "::error::Too many uncovered functions (${{ steps.stats.outputs.ncov_functions }})"
           /bin/false
 
       - name: Enforce coverage line minimum
-        if: ${{ always() && steps.stats.outputs.ncov_lines > env.allowed_ncov_lines }}
+        if: ${{ env.run_lcov == 'TRUE' && always() && steps.stats.outputs.ncov_lines > env.allowed_ncov_lines }}
         run: |
           echo "::error::Too many uncovered lines (${{ steps.stats.outputs.ncov_lines }})"
           /bin/false
 
       - name: Enforce coverage branch minimum
-        if: ${{ always() && steps.stats.outputs.ncov_branches > env.allowed_ncov_branches }}
+        if: ${{ env.run_lcov == 'TRUE' && always() && steps.stats.outputs.ncov_branches > env.allowed_ncov_branches }}
         run: |
           echo "::error::Too many uncovered branches (${{ steps.stats.outputs.ncov_branches }})"
           /bin/false
 
+      - name: Enforce keeping coverage function minimum up-to-date
+        if: ${{ env.run_lcov == 'TRUE' && always() && steps.stats.outputs.ncov_functions < env.allowed_ncov_functions }}
+        run: |
+          echo "::error::${{ steps.stats.outputs.ncov_functions }} uncovered function${{ steps.stats.outputs.ncov_functions == 1 && '' || 's' }} reported, but ${{ env.allowed_ncov_functions }} ${{ env.allowed_ncov_functions == 1 && 'is' || 'are' }} allowed."
+          echo "::error::Please update the 'allowed_ncov_functions' variable to ${{ steps.stats.outputs.ncov_functions }} in order to match the new coverage level."
+          /bin/false
+
+      - name: Enforce keeping coverage line minimum up-to-date
+        if: ${{ env.run_lcov == 'TRUE' && always() && steps.stats.outputs.ncov_lines < env.allowed_ncov_lines }}
+        run: |
+          echo "::error::${{ steps.stats.outputs.ncov_lines }} uncovered line${{ steps.stats.outputs.ncov_lines == 1 && '' || 's' }} reported, but ${{ env.allowed_ncov_lines }} ${{ env.allowed_ncov_lines == 1 && 'is' || 'are' }} allowed."
+          echo "::error::Please update the 'allowed_ncov_lines' variable to ${{ steps.stats.outputs.ncov_lines }} in order to match the new coverage level."
+          /bin/false
+
+      - name: Enforce keeping coverage branch minimum up-to-date
+        if: ${{ env.run_lcov == 'TRUE' && always() && steps.stats.outputs.ncov_branches < env.allowed_ncov_branches }}
+        run: |
+          echo "::error::${{ steps.stats.outputs.ncov_branches }} uncovered branch${{ steps.stats.outputs.ncov_branches == 1 && '' || 'es' }} reported, but ${{ env.allowed_ncov_branches }} ${{ env.allowed_ncov_branches == 1 && 'is' || 'are' }} allowed."
+          echo "::error::Please update the 'allowed_ncov_branches' variable to ${{ steps.stats.outputs.ncov_branches }} in order to match the new coverage level."
+          /bin/false
+
       - name: Assemble Results
         if: ${{ always() }}
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## Development Build: equuleus-rc1:dev81
+## Development Build: equuleus-rc1+dev85
+- Fix workflow bug and enforce updating of coverage minimums
+- See <https://github.com/nasa/osal/pull/1419>
+
+## Development Build: equuleus-rc1+dev81
 - Fix Address Sanitizer issue in vxworks-console-testrunner
 - f-sanitizer issue in coverage-shared-idma
 - See <https://github.com/nasa/osal/pull/1467> and <https://github.com/nasa/osal/pull/1470>

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER     81
+#define OS_BUILD_NUMBER     85
 #define OS_BUILD_BASELINE   "equuleus-rc1"
 #define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */