From a1ec2b3287aa6c9aa007eccf8f46abcfdfdad08a Mon Sep 17 00:00:00 2001 From: jdfiguer Date: Thu, 21 Mar 2024 13:19:31 -0400 Subject: [PATCH 1/3] Fix #742, Fix #759, Adds node20 compatible github actions --- .github/workflows/build-cfs-deprecated.yml | 14 +++++++------- .github/workflows/build-cfs-rtems4.11.yml | 6 +++--- .github/workflows/build-cfs-rtems5.yml | 6 +++--- .github/workflows/build-cfs.yml | 14 +++++++------- .github/workflows/build-deploy-doc.yml | 8 ++++---- .github/workflows/build-documentation.yml | 6 +++--- .github/workflows/build-run-app.yml | 6 +++--- .github/workflows/cfs-wiki.yml | 4 ++-- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql-reusable.yml | 10 +++++----- .github/workflows/format-check.yml | 6 +++--- .github/workflows/static-analysis-misra.yml | 8 ++++---- .github/workflows/static-analysis.yml | 6 +++--- .github/workflows/unit-test-coverage.yml | 6 +++--- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml index 04a927ee8..8991cc4b9 100644 --- a/.github/workflows/build-cfs-deprecated.yml +++ b/.github/workflows/build-cfs-deprecated.yml @@ -50,14 +50,14 @@ jobs: steps: - name: Cache Source and Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }} - name: Checkout cFS if: steps.cache-src-bld.outputs.cache-hit != 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -96,7 +96,7 @@ jobs: - name: Cache Source and Deprecated Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }} @@ -124,7 +124,7 @@ jobs: steps: - name: Cache Source and Deprecated Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }} @@ -141,7 +141,7 @@ jobs: working-directory: ./build/exe/cpu1/ - name: Archive cFS Startup Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cFS-startup-log-omit-deprecate-false${{ matrix.buildtype }} path: ./build/exe/cpu1/cFS_startup_cpu1.txt @@ -171,7 +171,7 @@ jobs: steps: - name: Cache Source and Deprecated Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }} @@ -205,7 +205,7 @@ jobs: working-directory: ./build/exe/cpu1/ - name: Archive Functional Test Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cFS-functional-test-log-omit-deprecate-false-${{ matrix.buildtype }} path: ./build/exe/cpu1/cf/cfe_test.log diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml index dc96556f7..90abf7b2d 100644 --- a/.github/workflows/build-cfs-rtems4.11.yml +++ b/.github/workflows/build-cfs-rtems4.11.yml @@ -51,7 +51,7 @@ jobs: steps: # Check out the cfs bundle - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -92,7 +92,7 @@ jobs: steps: # Checks out a copy of your repository on the ubuntu-latest machine - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -124,7 +124,7 @@ jobs: # Always archive test logs - name: Archive cFS Test Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 # Runs even if previous steps have failed if: always() with: diff --git a/.github/workflows/build-cfs-rtems5.yml b/.github/workflows/build-cfs-rtems5.yml index d23442e55..5cd725771 100644 --- a/.github/workflows/build-cfs-rtems5.yml +++ b/.github/workflows/build-cfs-rtems5.yml @@ -51,7 +51,7 @@ jobs: steps: # Check out the cfs bundle - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -92,7 +92,7 @@ jobs: steps: # Checks out a copy of your repository on the ubuntu-latest machine - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -122,7 +122,7 @@ jobs: # Always archive test logs - name: Archive cFS Test Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 # Runs even if previous steps have failed if: always() with: diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml index d9ab581ed..0ad0b9540 100644 --- a/.github/workflows/build-cfs.yml +++ b/.github/workflows/build-cfs.yml @@ -50,14 +50,14 @@ jobs: steps: - name: Cache Source and Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: build-${{ github.run_number }}-${{ matrix.buildtype }} - name: Checkout cFS if: steps.cache-src-bld.outputs.cache-hit != 'true' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -95,7 +95,7 @@ jobs: - name: Cache Source and Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: build-${{ github.run_number }}-${{ matrix.buildtype }} @@ -123,7 +123,7 @@ jobs: steps: - name: Cache Source and Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: build-${{ github.run_number }}-${{ matrix.buildtype }} @@ -140,7 +140,7 @@ jobs: working-directory: ./build/exe/cpu1/ - name: Archive cFS Startup Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cFS-startup-log-omit-deprecate-true-${{ matrix.buildtype }} path: ./build/exe/cpu1/cFS_startup_cpu1.txt @@ -169,7 +169,7 @@ jobs: steps: - name: Cache Source and Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/* key: build-${{ github.run_number }}-${{ matrix.buildtype }} @@ -203,7 +203,7 @@ jobs: working-directory: ./build/exe/cpu1/ - name: Archive cFS Startup Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cFS-functional-test-log-omit-deprecate-true-${{ matrix.buildtype }} path: ./build/exe/cpu1/cf/cfe_test.log diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index 1823bfbe2..fafaeb6f1 100644 --- a/.github/workflows/build-deploy-doc.yml +++ b/.github/workflows/build-deploy-doc.yml @@ -77,21 +77,21 @@ jobs: - name: Get cache if supplied id: cache-src-bld if: ${{ inputs.cache-key != '' }} - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ github.event.repository.name }}/${{ github.event.repository.name }}/* key: ${{ inputs.cache-key }} - name: Checkout Bundle Main if: ${{ inputs.app-name != '' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true repository: nasa/cFS - name: Checkout Repo if: ${{ inputs.app-name != '' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: apps/${{ inputs.app-name }} @@ -158,7 +158,7 @@ jobs: - name: Archive PDF if: ${{ inputs.buildpdf == true }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}_pdf path: ./deploy/${{ matrix.target }}.pdf diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index e0373cc24..5cbfd04b6 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -33,13 +33,13 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Cache Source and Build id: cache-src-bld - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /home/runner/work/${{ github.event.repository.name }}/${{ github.event.repository.name }}/* key: cfs-doc-${{ github.run_number }} @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml index 0b9b69812..80cf328d3 100644 --- a/.github/workflows/build-run-app.yml +++ b/.github/workflows/build-run-app.yml @@ -58,13 +58,13 @@ jobs: fi - name: Checkout Bundle Main - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true repository: nasa/cFS - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: apps/${{ env.APP_LOWER }} @@ -93,7 +93,7 @@ jobs: ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002 - name: Archive results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cFS_startup_log path: cFS_startup_cpu1.txt diff --git a/.github/workflows/cfs-wiki.yml b/.github/workflows/cfs-wiki.yml index 366440642..f3186d1b9 100644 --- a/.github/workflows/cfs-wiki.yml +++ b/.github/workflows/cfs-wiki.yml @@ -16,7 +16,7 @@ jobs: steps: # Checks out a copy of your repository on the ubuntu-latest machine - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -26,7 +26,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Archive CCB agenda artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ccb-agenda path: ./CCBAgenda.md \ No newline at end of file diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index f51a30665..534fb117d 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run Changelog uses: heinrichreimer/github-changelog-generator-action@v2.1.1 diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml index 3139da9c4..1971d7a60 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-reusable.yml @@ -104,7 +104,7 @@ jobs: - name: Checkout ${{ github.repository }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -116,7 +116,7 @@ jobs: working-directory: ${{env.BUILD_DIRECTORY}} - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: cpp config-file: nasa/cFS/.github/codeql/codeql-${{matrix.scan-type}}.yml@main @@ -126,7 +126,7 @@ jobs: working-directory: ${{env.BUILD_DIRECTORY}} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: add-snippets: true category: ${{matrix.scan-type}} @@ -149,12 +149,12 @@ jobs: output: CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif - name: Archive Sarif - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: CodeQL-Sarif-${{ matrix.scan-type }} path: CodeQL-Sarif-${{ matrix.scan-type }} - name: Upload SARIF - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: CodeQL-Sarif-${{ matrix.scan-type }}/Codeql-${{ matrix.scan-type }}.sarif diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 3866ed8b9..79c7eefed 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -40,12 +40,12 @@ jobs: sudo apt-get update && sudo apt-get install clang-format - name: Checkout bundle - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: nasa/cFS - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: repo @@ -56,7 +56,7 @@ jobs: git diff > $GITHUB_WORKSPACE/style_differences.txt - name: Archive Static Analysis Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: style_differences path: style_differences.txt diff --git a/.github/workflows/static-analysis-misra.yml b/.github/workflows/static-analysis-misra.yml index 1344cfaeb..928d33a6d 100644 --- a/.github/workflows/static-analysis-misra.yml +++ b/.github/workflows/static-analysis-misra.yml @@ -42,7 +42,7 @@ jobs: # Checks out a copy of the cfs bundle - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -103,21 +103,21 @@ jobs: echo "CONTAINER_WORKSPACE=${PWD}" >> ${GITHUB_ENV} - name: Archive bundle static analysis artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{matrix.cppcheck =='bundle'}} with: name: ${{matrix.cppcheck}}-cppcheck-err path: ./*cppcheck_err.* - name: Archive osal, cfe, and psp static analysis artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{matrix.cppcheck !='bundle'}} with: name: ${{matrix.cppcheck}}-cppcheck-err path: ./${{matrix.cppcheck}}/*cppcheck_err.* - name: Upload sarif results - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: '${{matrix.cppcheck}}_cppcheck_err.sarif' checkout_path: ${{ env.CONTAINER_WORKSPACE }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 2afa05d6b..093616899 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -61,7 +61,7 @@ jobs: # Checks out a copy of the reference repository - name: Checkout subject repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: source submodules: true @@ -104,14 +104,14 @@ jobs: run: xsltproc cppcheck-xml2text.xslt cppcheck_err.xml | tee $GITHUB_STEP_SUMMARY cppcheck_err.txt - name: Upload SARIF results - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: ${{ github.workspace }}/cppcheck_err.sarif checkout_path: ${{ github.workspace }}/source category: 'cppcheck' - name: Archive static analysis artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cppcheck-errors path: ./*cppcheck_err.* diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml index 14a2f59d2..4a222b3fd 100644 --- a/.github/workflows/unit-test-coverage.yml +++ b/.github/workflows/unit-test-coverage.yml @@ -58,13 +58,13 @@ jobs: echo "APP_LOWER=$(echo ${{ inputs.app-name }} | sed 's/[A-Z]/\L&/g')" >> $GITHUB_ENV - name: Checkout Bundle Main - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true repository: nasa/cFS - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: apps/${{ env.APP_LOWER }} @@ -116,7 +116,7 @@ jobs: - name: Archive results # Upload if success or failure which supports skipping, unlike always() if: success() || failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Unit test and coverage results path: | From d8bcda215591f8e047dcb3f2b75c839784a4976a Mon Sep 17 00:00:00 2001 From: jdfiguer Date: Wed, 1 May 2024 19:08:43 -0400 Subject: [PATCH 2/3] Fix #760, Renames unit-test-coverage.yml workflow name --- .github/workflows/unit-test-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml index 14a2f59d2..7af99bdc4 100644 --- a/.github/workflows/unit-test-coverage.yml +++ b/.github/workflows/unit-test-coverage.yml @@ -1,4 +1,4 @@ -name: Build Document +name: Unit Test and Coverage on: workflow_call: From 76826c7a1f7be6706953bfbb94eebd6bedadc496 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 6 May 2024 11:05:06 -0400 Subject: [PATCH 3/3] IC: equuleus-rc1+dev12 *Combines:* cFE equuleus-rc1+dev137 osal equuleus-rc1+dev66 PSP equuleus-rc1+dev42 to_lab equuleus-rc1+dev56 **Includes:** *cFS* - #751 - #762 *cFE* - nasa/cFE#2537 - nasa/cFE#2525 *osal* - nasa/osal#1460 *PSP* - nasa/psp#430 *to_lab* - nasa/to_lab#198 Co-authored by: Justin Figueroa Co-authored by: Joseph Hickey Co-authored by: Cody Martin Co-authored by: Dan Knutsen --- apps/to_lab | 2 +- cfe | 2 +- osal | 2 +- psp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/to_lab b/apps/to_lab index 487af098c..d972baf9e 160000 --- a/apps/to_lab +++ b/apps/to_lab @@ -1 +1 @@ -Subproject commit 487af098ced990a0c9abc451ca067cb4124c938d +Subproject commit d972baf9e44e865ed507b31741e78ee83a6b217d diff --git a/cfe b/cfe index 28a58203a..505baa178 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 28a58203a56ed7c1512c79c961fadeddb5bbb7bb +Subproject commit 505baa17858ed7828c595083cc1e732571213e41 diff --git a/osal b/osal index 372ea6598..6483329bc 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 372ea659885d9b306bfdb9b879e0d56c74f96709 +Subproject commit 6483329bc0c76a177b81874deb21332796195e8c diff --git a/psp b/psp index 70be39db9..f592144b2 160000 --- a/psp +++ b/psp @@ -1 +1 @@ -Subproject commit 70be39db9259061d3c9aaf1bc3eb8921e8794828 +Subproject commit f592144b2c2f7bd2be2d6738fdee9d3351274c3f