From e84b5045b3d74d3cf9d9a1b3b4014fb46cbf6c9e Mon Sep 17 00:00:00 2001 From: ArielSAdamsNASA Date: Fri, 14 Oct 2022 10:22:14 -0500 Subject: [PATCH 1/3] Fix #593, Add Category to Cppcheck Workflow --- .github/workflows/static-analysis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index d6f5e1237..b3107b21a 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -69,6 +69,7 @@ jobs: with: sarif_file: 'general_cppcheck_err.sarif' checkout_path: ${{ env.CONTAINER_WORKSPACE }} + category: 'General-cppcheck' # Run strict static analysis for embedded portions of cfe, osal, and psp - name: Strict cppcheck @@ -97,6 +98,7 @@ jobs: with: sarif_file: 'strict_cppcheck_err.sarif' checkout_path: ${{ env.CONTAINER_WORKSPACE }} + category: 'Strict-cppcheck' - name: Check for general errors run: | From c66839cbc3f6c0a7525c5d40c022ab1fd986ee21 Mon Sep 17 00:00:00 2001 From: havencarlson Date: Fri, 19 Aug 2022 14:36:53 -0400 Subject: [PATCH 2/3] Fix #554, Updated ubuntu version in CI workflows --- .github/workflows/build-cfs-deprecated.yml | 8 ++++---- .github/workflows/build-cfs-rtems4.11.yml | 4 ++-- .github/workflows/build-cfs-rtems5.yml | 4 ++-- .github/workflows/build-cfs.yml | 8 ++++---- .github/workflows/build-deploy-doc.yml | 2 +- .github/workflows/build-run-app.yml | 2 +- .github/workflows/codeql-reusable.yml | 4 ++-- .github/workflows/format-check.yml | 10 ++++------ .github/workflows/static-analysis.yml | 2 +- .github/workflows/unit-test-coverage.yml | 2 +- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml index 565ab4f40..a0ae71501 100644 --- a/.github/workflows/build-cfs-deprecated.yml +++ b/.github/workflows/build-cfs-deprecated.yml @@ -36,7 +36,7 @@ jobs: name: "[Deprecated] Build" needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -78,7 +78,7 @@ jobs: tests-and-coverage-omit-deprecated-false: name: "[Deprecated] Run Unit Tests and Check Coverage" needs: build-cfs-omit-deprecated-false - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -110,7 +110,7 @@ jobs: run-cfs-omit-deprecated-false: name: "[Deprecated] Run cFS" needs: build-cfs-omit-deprecated-false - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -160,7 +160,7 @@ jobs: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: run-cfs-omit-deprecated-false name: "[DEPRECATED] cFS Functional Tests" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 strategy: diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml index 81524d0c0..63151ad0b 100644 --- a/.github/workflows/build-cfs-rtems4.11.yml +++ b/.github/workflows/build-cfs-rtems4.11.yml @@ -34,7 +34,7 @@ jobs: needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest strategy: @@ -70,7 +70,7 @@ jobs: test-cfs: name: Test - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest needs: build-cfs diff --git a/.github/workflows/build-cfs-rtems5.yml b/.github/workflows/build-cfs-rtems5.yml index 35866d88d..c0419b32d 100644 --- a/.github/workflows/build-cfs-rtems5.yml +++ b/.github/workflows/build-cfs-rtems5.yml @@ -34,7 +34,7 @@ jobs: needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-5:latest strategy: @@ -70,7 +70,7 @@ jobs: test-cfs: name: Test - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-5:latest needs: build-cfs diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml index 4cff77f1f..4c72579ab 100644 --- a/.github/workflows/build-cfs.yml +++ b/.github/workflows/build-cfs.yml @@ -36,7 +36,7 @@ jobs: name: Build needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -77,7 +77,7 @@ jobs: tests-and-coverage-omit-deprecated-true: name: Run Unit Tests and Check Coverage needs: build-cfs-omit-deprecated-true - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -109,7 +109,7 @@ jobs: run-cfs-omit-deprecated-true: name: Run needs: build-cfs-omit-deprecated-true - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -158,7 +158,7 @@ jobs: run-functional-test-app-omit-deprecated-true: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: run-cfs-omit-deprecated-true - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 strategy: diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index 8c4f59c1f..113b61a9d 100644 --- a/.github/workflows/build-deploy-doc.yml +++ b/.github/workflows/build-deploy-doc.yml @@ -55,7 +55,7 @@ jobs: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }} name: Build Documentation - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml index 993d40dcf..be5a72d73 100644 --- a/.github/workflows/build-run-app.yml +++ b/.github/workflows/build-run-app.yml @@ -40,7 +40,7 @@ jobs: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }} name: Build and run app, confirm startup message - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Set up environment variables diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml index 50e0d4967..9e0cbbe3d 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-reusable.yml @@ -55,7 +55,7 @@ env: jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. check-for-duplicates: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # Map a step output to a job output outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -71,7 +71,7 @@ jobs: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 strategy: diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 74d51e247..33b0bd188 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -31,15 +31,13 @@ jobs: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 steps: - name: Install format checker run: | - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main' - sudo apt-get update && sudo apt-get install clang-format-10 + sudo apt-get update && sudo apt-get install clang-format - name: Checkout bundle uses: actions/checkout@v2 @@ -54,7 +52,7 @@ jobs: - name: Generate format differences run: | cd repo - find . -name "*.[ch]" -exec clang-format-10 -i -style=file {} + + find . -name "*.[ch]" -exec clang-format -i -style=file {} + git diff > $GITHUB_WORKSPACE/style_differences.txt - name: Archive Static Analysis Artifacts @@ -76,7 +74,7 @@ jobs: needs: check-for-duplicates # Only run for pull-requests. if: ${{ github.event_name == 'pull_request' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 steps: # Check github pull-request title against the pattern. diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index d6f5e1237..b3b737e59 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -33,7 +33,7 @@ jobs: needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Run cppcheck - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml index 919bbea58..bfee2b691 100644 --- a/.github/workflows/unit-test-coverage.yml +++ b/.github/workflows/unit-test-coverage.yml @@ -45,7 +45,7 @@ jobs: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }} name: Build, run unit tests and enforce coverage - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Install coverage tools From f9ff3e5a354c85c59f88c6b828af85a03a78c349 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 25 Oct 2022 10:39:32 -0400 Subject: [PATCH 3/3] IC: Caelum-rc4+dev27 *Combines:* cfe v7.0.0-rc4+dev201 osal v6.0.0-rc4+dev147 **Includes:** *cFS* - #594 - #559 *cFE* - nasa/cfe#2184 *osal* - nasa/osal#1319 Co-authored by: Ariel Adams Co-authored by: Joseph Hickey Co-authored by: Haven Carlson --- cfe | 2 +- osal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfe b/cfe index be88a0731..7a220ae80 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit be88a07313ff3b579c8abaef4b4a9085e74aabdf +Subproject commit 7a220ae809555cad86fb98d823ec77528a2fb125 diff --git a/osal b/osal index fa9671fa6..4567e8bd8 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit fa9671fa608ff5113f24990a78e6e7f8d47eb392 +Subproject commit 4567e8bd8df22a770455ba13830f55f9e02c2c1c