Skip to content

Commit

Permalink
Merge pull request nasa#763 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
IC: equuleus-rc1+dev12
  • Loading branch information
dzbaker authored May 21, 2024
2 parents f9dc33a + 76826c7 commit 32eb0f8
Show file tree
Hide file tree
Showing 18 changed files with 56 additions and 56 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-cfs-deprecated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-cfs-rtems4.11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-cfs-rtems5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-cfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-deploy-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/download-artifact@v3

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-run-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cfs-wiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run Changelog
uses: heinrichreimer/[email protected]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Checkout ${{ github.repository }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -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
Expand All @@ -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}}
Expand All @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static-analysis-misra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 }}
Expand Down
Loading

0 comments on commit 32eb0f8

Please sign in to comment.