From c14a1f7d056cf6dd623d35fccef9003d9cbef640 Mon Sep 17 00:00:00 2001 From: ArielSAdams <63608107+ArielSAdams@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:37:23 -0500 Subject: [PATCH 1/5] Fix #509, Rename Tool for CodeQL Results --- .github/workflows/codeql-reusable.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml index 091df690e..34de98ad2 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-reusable.yml @@ -125,9 +125,21 @@ jobs: with: add-snippets: true category: ${{matrix.scan-type}} - + upload: false + output: CodeQL-Sarif-${{ matrix.scan-type }} + + - name: Rename Sarif + run: | + mv CodeQL-Sarif-${{ matrix.scan-type }}/cpp.sarif CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif + sed -i 's/"name" : "CodeQL"/"name" : "CodeQL-${{ matrix.scan-type }}"/g' CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif + - name: Archive Sarif uses: actions/upload-artifact@v2 with: name: CodeQL-Sarif-${{ matrix.scan-type }} - path: /home/runner/work/${{env.REPO}}/results/cpp.sarif + path: CodeQL-Sarif-${{ matrix.scan-type }} + + - name: Upload SARIF + uses: github/codeql-action/upload-sarif@v1 + with: + sarif_file: CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif From e0479f09081d959998f948279502500a96f7723b Mon Sep 17 00:00:00 2001 From: ArielSAdamsNASA Date: Mon, 27 Jun 2022 11:40:46 -0500 Subject: [PATCH 2/5] Fix #515, Upgrade CodeQL Action to V2 --- .github/workflows/codeql-reusable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml index 091df690e..79535c0e8 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-reusable.yml @@ -111,7 +111,7 @@ jobs: working-directory: ${{env.BUILD_DIRECTORY}} - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: c config-file: nasa/cFS/.github/codeql/codeql-${{matrix.scan-type}}.yml@main @@ -121,7 +121,7 @@ jobs: working-directory: ${{env.BUILD_DIRECTORY}} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 with: add-snippets: true category: ${{matrix.scan-type}} From 8b25d91df9e63974aafce87efb4b22df80661ea9 Mon Sep 17 00:00:00 2001 From: ArielSAdamsNASA Date: Mon, 27 Jun 2022 12:01:34 -0500 Subject: [PATCH 3/5] Fix #513, Remove TravisCI Config File --- .travis.yml | 141 ---------------------------------------------------- 1 file changed, 141 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 63b43af56..000000000 --- a/.travis.yml +++ /dev/null @@ -1,141 +0,0 @@ -os: linux -dist: bionic -language: c -compiler: - - gcc -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - cmake cppcheck doxygen lcov graphviz -env: - global: - - SIMULATION=native - - ENABLE_UNIT_TESTS=true - - DEPLOY_DIR=$TRAVIS_BUILD_DIR/deploy - jobs: - - BUILDTYPE=release OMIT_DEPRECATED=true - - BUILDTYPE=release OMIT_DEPRECATED=false - - BUILDTYPE=debug OMIT_DEPRECATED=true - - BUILDTYPE=debug OMIT_DEPRECATED=false - -# Build the pdfs and copy to the deploy directory -before_deploy: - - sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra - - mkdir $DEPLOY_DIR - - cd $TRAVIS_BUILD_DIR/build/doc/users_guide/latex - - make > build.txt - - cp refman.pdf $DEPLOY_DIR/cFE_Users_Guide.pdf - - cd $TRAVIS_BUILD_DIR/build/doc/osalguide/latex - - make > build.txt - - cp refman.pdf $DEPLOY_DIR/OSAL_Users_Guide.pdf - - cd $TRAVIS_BUILD_DIR - -# Deploy documentation to github pages -deploy: - provider: pages - strategy: git - cleanup: false - token: $GITHUB_TOKEN # Set in personal repository, as a secure variable - keep_history: false - local_dir: $DEPLOY_DIR - on: - condition: $BUILDTYPE = release && $OMIT_DEPRECATED = false - edge: true - -script: - # git SHA report - - git submodule - - git rev-parse HEAD - # Check versions - - cppcheck --version - # Setup standard permissive build - - cp cfe/cmake/Makefile.sample Makefile - - cp -r cfe/cmake/sample_defs sample_defs - # Static code analysis - # Below is intent but fails - exit code bug in cppcheck 1.82 - # - cppcheck --force --inline-suppr --quiet --error-exitcode=1 . - # Work around script: - - cppcheck --force --inline-suppr --quiet . 2> cppcheck_err.txt - - | - if [[ -s cppcheck_err.txt ]]; then - echo "You must fix cppcheck errors before submitting a pull request" - echo "" - cat cppcheck_err.txt - exit -1 - fi - # Prep and build - - make prep - - make - - make install - # Run unit tests and generate coverage results - - make test - - | - if [[ -s build/native/Testing/Temporary/LastTestsFailed.log ]]; then - echo "You must fix unit test errors before submitting a pull request" - echo "" - cat build/native/Testing/Temporary/LastTestsFailed.log - grep "\[ FAIL\]" build/native/Testing/Temporary/LastTest.log - exit -1 - fi - - make lcov - # Eventually check/enforce minimum coverage - # Make documentation - - make doc > make_doc_stdout.txt 2> make_doc_stderr.txt - - | - if [[ -s make_doc_stderr.txt ]]; then - echo "You must fix doxygen errors for \"doc\" before submitting a pull request" - echo "" - cat make_doc_stderr.txt - exit -1 - fi - # Eventually enforce no doxygen warnings - - make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt - - | - if [[ -s make_usersguide_stderr.txt ]]; then - echo "You must fix doxygen errors for \"usersguide\" before submitting a pull request" - echo "" - cat make_usersguide_stderr.txt - exit -1 - fi - - | - if [[ -s build/doc/warnings.log ]]; then - echo "You must fix doxygen warnings for \"usersguide\" before submitting a pull request" - echo "" - cat build/doc/warnings.log - exit -1 - fi - - make osalguide > make_osalguide_stdout.txt 2> make_osalguide_stderr.txt - - | - if [[ -s make_osalguide_stderr.txt ]]; then - echo "You must fix doxygen errors for \"osalguide\" before submitting a pull request" - echo "" - cat make_osalguide_stderr.txt - exit -1 - fi - - | - if [[ -s build/doc/warnings.log ]]; then - echo "You must fix doxygen warnings for \"osalguide\" before submitting a pull request" - echo "" - cat build/doc/warnings.log - exit -1 - fi - # List cpu1 for core binary - - ls build/exe/cpu1/ - # Start cFE (pipe output to file), pause, send reset command, check outputs - - cd build/exe/cpu1 - - ./core-cpu1 > cFS_startup.txt & - - sleep 30 - - ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002 - - | - if [[ -n $(grep -i "warn\|err\|fail" cFS_startup.txt) ]]; then - echo "Must resolve warn|err|fail in cFS startup before submitting a pull request" - echo "" - grep -i 'warn\|err\|fail' cFS_startup.txt - exit -1 - fi - -# After script sleep avoids Job log truncation -after_script: - - sleep 1 From 6857e96860639f3ee22957099b105f0a4432c3b5 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 28 Jun 2022 12:42:07 -0400 Subject: [PATCH 4/5] Fix #520, remove cmake_minimum_required in tools The tools CMakeLists.txt file just adds the subdirectories, it has no logic. The old version being referenced here triggers a deprecation warning, so just remove it. --- tools/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 92297a853..70d9560c3 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,5 +1,4 @@ # CMake snippet for building the host-side tools. -cmake_minimum_required(VERSION 2.6.4) project(CFETOOLS C) add_subdirectory(cFS-GroundSystem/Subsystems/cmdUtil) From cce10ef8f0678eba37cb68e6582b544b636b180a Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 7 Jul 2022 13:25:51 -0400 Subject: [PATCH 5/5] IC: Caelum-rc4+dev12 *Combines:* osal v6.0.0-rc4+dev93 ci_lab v2.5.0-rc4+dev22 to_lab v2.5.0-rc4+dev24 sch_lab v2.5.0-rc4+dev31 **Includes:** - nasa/osal#1265, Set OSAL Loader unit test number of modules to OSAL_CONFIG_MAX_MODULES *Update Minimum CMake Version* - nasa/osal#1267, Update minimum required cmake version - nasa/ci_lab#113, update cmake_minimum_required - nasa/sch_lab#117, update cmake_minimum_required Co-authored by: Jacob Hageman Co-authored by: Ariel Adams Co-authored by: Joseph Hickey --- apps/ci_lab | 2 +- apps/sch_lab | 2 +- apps/to_lab | 2 +- osal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index 9a70ffaa0..05ad755c5 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 9a70ffaa0658ea97105c0eebf91d3793e8e01314 +Subproject commit 05ad755c5b418b0aa8a7fb363789eb6adf8b4db8 diff --git a/apps/sch_lab b/apps/sch_lab index c044cf8b2..512833ebe 160000 --- a/apps/sch_lab +++ b/apps/sch_lab @@ -1 +1 @@ -Subproject commit c044cf8b2635548c5217079914706f1d231c39d3 +Subproject commit 512833ebecc331c1016290e1ad23bdeda53324bc diff --git a/apps/to_lab b/apps/to_lab index 565d96118..8b0037442 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 565d96118160a8f9b64d6e7f0fb648a7c7a88991 +Subproject commit 8b0037442c579042f499bde17ca885299ae4825b diff --git a/osal b/osal index 419c673b9..a07b5e83f 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 419c673b9d982bf0bd34546a7568201c6bcf8b62 +Subproject commit a07b5e83f9663b01cda7ac26960d25eca0a57b00