Merge branch 'main' into sbom_add_cpe_info

FreeRTOS · Apr 5, 2024 · ec11a33 · ec11a33
2 parents e098665 + 498c064
commit ec11a33
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 112 deletions.
diff --git a/.github/workflows/executableMonitorTests.yml b/.github/workflows/executableMonitorTests.yml
@@ -23,7 +23,7 @@ jobs:
           os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
 
       - env:
           stepName: Install Windows Build tools
@@ -185,7 +185,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
     - env:
         stepName: Install Windows Build tools
       name: ${{ env.stepName }}

diff --git a/.github/workflows/formattingTests.yml b/.github/workflows/formattingTests.yml
@@ -18,7 +18,7 @@ jobs:
   uncrustify-formatting-success-cases:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
 
     - env:
         stepName: "Functional | Success | Exclude Files and Dirs"
@@ -61,7 +61,7 @@ jobs:
   uncrustify-formatting-error-cases:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
       - env:
           stepName: "Functional | Failure | Whitespace, CRLF, and Format Failure"
         name: ${{ env.stepName }}
@@ -297,7 +297,7 @@ jobs:
   clang-formatting-success-cases:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
 
     - env:
         stepName: "Functional | Success | Exclude Files and Dirs"
@@ -340,7 +340,7 @@ jobs:
   clang-formatting-error-cases:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
       - env:
           stepName: "Functional | Failure | Whitespace, CRLF, and Format Failure"
         name: ${{ env.stepName }}

diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
@@ -53,9 +53,8 @@ jobs:
               run-link-verifier: true,
               run-complexity: true,
               run-doxygen: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_UNIT_TESTS=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror',
+              build-flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*3rdparty\*"',
-              line-coverage: 100,
             },
             {
               repository: coreHTTP,
@@ -66,7 +65,6 @@ jobs:
               run-doxygen: true,
               build-flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*3rdparty\*"',
-              line-coverage: 100,
             },
             {
               repository: coreJSON,
@@ -77,7 +75,6 @@ jobs:
               run-doxygen: true,
               build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON  -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*source\*"',
-              line-coverage: 100,
             },
             {
               repository: coreMQTT,
@@ -88,7 +85,6 @@ jobs:
               run-doxygen: true,
               build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG -DLIBRARY_LOG_LEVEL=LOG_DEBUG',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 100,
             },
             {
               repository: corePKCS11,
@@ -97,9 +93,9 @@ jobs:
               run-link-verifier: true,
               run-complexity: true,
               run-doxygen: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTS=1 -DSYSTEM_TESTS=0 -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG',
+              build-flags: -DCMAKE_BUILD_TYPE=Debug -DSYSTEM_TESTS=0 -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 95,
+              branch-coverage: 90,
             },
             {
               repository: coreSNTP,
@@ -108,9 +104,8 @@ jobs:
               run-link-verifier: true,
               run-complexity: true,
               run-doxygen: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_UNIT_TESTS=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG -Wno-error=pedantic -Wno-variadic-macros -DLOGGING_LEVEL_DEBUG=1',
+              build-flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG -Wno-error=pedantic -Wno-variadic-macros -DLOGGING_LEVEL_DEBUG=1',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 100,
             },
             {
               repository: FreeRTOS-Cellular-Interface,
@@ -121,7 +116,6 @@ jobs:
               run-doxygen: true,
               build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 99,
             },
             {
               repository: Device-Defender-for-AWS-IoT-embedded-sdk,
@@ -132,73 +126,72 @@ jobs:
               run-doxygen: true,
               build-flags: -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG',
               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 100,
             },
-           {
-              repository: Device-Shadow-for-AWS-IoT-embedded-sdk,
-              org: AWS,
-              branch: main,
-              run-link-verifier: true,
-              run-complexity: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG',
-              coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 100,
-           },
-           {
-              repository: Fleet-Provisioning-for-AWS-IoT-embedded-sdk,
-              org: AWS,
-              branch: main,
-              run-link-verifier: true,
-              run-complexity: true,
-              run-doxygen: true,
-              build-flags:  -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG',
-              coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 100,
-           },
-           {
-              repository: Jobs-for-AWS-IoT-embedded-sdk,
-              org: AWS,
-              branch: main,
-              run-link-verifier: true,
-              run-complexity: false,
-              run-doxygen: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror',
-              coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*source\*"',
-              line-coverage: 100,
-
-           },
-           {
-              repository: ota-for-AWS-IoT-embedded-sdk,
-              org: AWS,
-              branch: main,
-              run-link-verifier: true,
-              run-complexity: true,
-              run-doxygen: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG',
-              line-coverage: 95,
-           },
-           {
-              repository: SigV4-for-AWS-IoT-embedded-sdk,
-              org: AWS,
-              branch: main,
-              run-complexity: true,
-              run-doxygen: true,
-              build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_UNIT_TESTS=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG -DLOGGING_LEVEL_DEBUG=1',
-              coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
-              line-coverage: 100,
-           },
+            {
+               repository: Device-Shadow-for-AWS-IoT-embedded-sdk,
+               org: AWS,
+               branch: main,
+               run-link-verifier: true,
+               run-complexity: true,
+               build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG',
+               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
+            },
+            {
+               repository: Fleet-Provisioning-for-AWS-IoT-embedded-sdk,
+               org: AWS,
+               branch: main,
+               run-link-verifier: true,
+               run-complexity: true,
+               run-doxygen: true,
+               build-flags:  -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror -DNDEBUG',
+               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
+            },
+            {
+               repository: Jobs-for-AWS-IoT-embedded-sdk,
+               org: AWS,
+               branch: main,
+               run-link-verifier: true,
+               run-complexity: false,
+               run-doxygen: true,
+               build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -Werror',
+               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*source\*"',
+            },
+            {
+               repository: ota-for-AWS-IoT-embedded-sdk,
+               org: AWS,
+               branch: main,
+               run-link-verifier: true,
+               run-complexity: true,
+               run-doxygen: true,
+               build-flags: -DCMAKE_BUILD_TYPE=Debug -DBUILD_CLONE_SUBMODULES=ON -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG',
+            },
+            {
+               repository: SigV4-for-AWS-IoT-embedded-sdk,
+               org: AWS,
+               branch: main,
+               run-complexity: true,
+               run-doxygen: true,
+               build-flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG -DLOGGING_LEVEL_DEBUG=1',
+               coverage-skips: '"\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*"',
+            },
           ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-python@v5.1.0
 
-      - name: Install Common Tools
+      - env:
+          stepName: Install Common Tools
         shell: bash
         run: |
+          # ${{ env.stepName }}
+          echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
+          sudo apt-get -y update
           sudo apt-get install -y lcov sed build-essential cmake
+          echo -e "::endgroup::"
+          echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
 
       - name: "Clone: ${{ matrix.inputs.repository }}"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           repository: ${{ matrix.inputs.org }}/${{ matrix.inputs.repository }}
           ref: ${{ matrix.inputs.branch }}
@@ -241,7 +234,7 @@ jobs:
 
       - name: "Recursive Clone: ${{ matrix.inputs.repository }}"
         if: success() || failure()
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           repository: ${{ matrix.inputs.org }}/${{ matrix.inputs.repository }}
           ref: ${{ matrix.inputs.branch }}
@@ -256,17 +249,21 @@ jobs:
         working-directory: repo/${{ matrix.inputs.repository }}_Recursive
         run: git submodule update --checkout --init --recursive
 
-      - name: Build ${{matrix.inputs.repository}}
+      - env:
+          stepName: Build ${{matrix.inputs.repository}}
         if: matrix.inputs.run-complexity && ( success() || failure() )
         shell: bash
         working-directory: repo/${{matrix.inputs.repository}}_Recursive
         run: |
-          echo -e "::group:: Install lcov"
-          sudo apt-get install -y lcov
-          echo -e "::endgroup::"
-          cmake -S ./test -B build/ ${{ matrix.inputs.build-flags }}
+          # ${{ env.stepName }}
+          echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
+          cmake -S ./test -B build/ ${{ matrix.inputs.build-flags }} -DUNITTEST=ON
           make -C build/ all
 
+          echo -e "::endgroup::"
+          echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
       - name: Test
         if: matrix.inputs.run-complexity && ( success() || failure() )
         shell: bash
@@ -289,27 +286,34 @@ jobs:
           output: size_table_new.html
           check_against: docs/doxygen/include/size_table.md
 
-      - name: Run Coverage ${{matrix.inputs.repository}}
+      - env:
+          stepName: Coverage ${{matrix.inputs.repository}}
         if: matrix.inputs.run-complexity && ( success() || failure() )
         shell: bash
         working-directory: repo/${{matrix.inputs.repository}}_Recursive
         run: |
+          # ${{ env.stepName }}
+          echo -e "::group::${{ env.bashInfo }} Build ${{matrix.inputs.repository}} ${{ env.bashEnd }}"
           make -C build/ coverage
+          echo -e "::endgroup::"
+          echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
+
           if [[ "${{ matrix.inputs.coverage-skips }}" != "" ]]; then
             declare -a EXCLUDE=( ${{ matrix.inputs.coverage-skips }} )
             echo ${EXCLUDE[@]} | xargs lcov --rc lcov_branch_coverage=1 -r build/coverage.info -o build/coverage.info
           else
             lcov --rc lcov_branch_coverage=1 -r build/coverage.info -o build/coverage.info
           fi
+          echo -e "::endgroup::"
+
           lcov --rc lcov_branch_coverage=1 --list build/coverage.info
 
       - name: Test coverage cop action ${{matrix.inputs.repository}}
         if: matrix.inputs.run-complexity && ( success() || failure() )
         uses: ./coverage-cop
         with:
           coverage-file: repo/${{matrix.inputs.repository}}_Recursive/build/coverage.info
-          branch-coverage-min: 70
-          line-coverage-min: ${{ matrix.inputs.line-coverage }}
+          branch-coverage-min: ${{ matrix.inputs.branch_coverage }}
 
   PR-uncrustify-checks:
     runs-on: ubuntu-20.04
@@ -404,11 +408,11 @@ jobs:
           ]
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-python@v5.1.0
 
       - name: "Clone: ${{ matrix.inputs.repository }}"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           repository: ${{ matrix.inputs.org }}/${{ matrix.inputs.repository }}
           ref: ${{ matrix.inputs.branch }}