From 201798bcb76e9842590feda528b95332f5c26eb2 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 27 Jul 2022 09:04:50 -0600 Subject: [PATCH 1/2] Fix #530, Default CI to bash to apply pipefail Without the bash pipefail option return codes can get masked missing failures. Specifically seen in the unit test reusable workflow where ctest returns were masked. By forcing the default shell as bash, GitHub applies the pipefail option. --- .github/workflows/build-cfs-deprecated.yml | 5 +++++ .github/workflows/build-cfs-rtems4.11.yml | 4 ++++ .github/workflows/build-cfs-rtems5.yml | 6 +++++- .github/workflows/build-cfs.yml | 5 +++++ .github/workflows/build-deploy-doc.yml | 5 +++++ .github/workflows/build-documentation.yml | 5 +++++ .github/workflows/build-run-app.yml | 5 +++++ .github/workflows/changelog.yml | 7 ++++++- .github/workflows/codeql-reusable.yml | 5 +++++ .github/workflows/format-check.yml | 5 +++++ .github/workflows/static-analysis-misra.yml | 5 +++++ .github/workflows/static-analysis.yml | 5 +++++ .github/workflows/unit-test-coverage.yml | 5 +++++ 13 files changed, 65 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml index c41e2aa54..565ab4f40 100644 --- a/.github/workflows/build-cfs-deprecated.yml +++ b/.github/workflows/build-cfs-deprecated.yml @@ -12,6 +12,11 @@ env: CTEST_OUTPUT_ON_FAILURE: true REPO_NAME: ${{ github.event.repository.name }} +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. check-for-duplicates: diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml index 9194331f4..81524d0c0 100644 --- a/.github/workflows/build-cfs-rtems4.11.yml +++ b/.github/workflows/build-cfs-rtems4.11.yml @@ -9,6 +9,10 @@ env: OMIT_DEPRECATED: true CTEST_OUTPUT_ON_FAILURE: true +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. diff --git a/.github/workflows/build-cfs-rtems5.yml b/.github/workflows/build-cfs-rtems5.yml index 807ee5733..35866d88d 100644 --- a/.github/workflows/build-cfs-rtems5.yml +++ b/.github/workflows/build-cfs-rtems5.yml @@ -9,6 +9,10 @@ env: OMIT_DEPRECATED: true CTEST_OUTPUT_ON_FAILURE: true +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. @@ -123,4 +127,4 @@ jobs: if: always() with: name: cFS-rtems-log-summary-${{ matrix.buildtype }} - path: ./build/exe/cpu1/*.log \ No newline at end of file + path: ./build/exe/cpu1/*.log diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml index 6ddc3e5bc..4cff77f1f 100644 --- a/.github/workflows/build-cfs.yml +++ b/.github/workflows/build-cfs.yml @@ -12,6 +12,11 @@ env: CTEST_OUTPUT_ON_FAILURE: true REPO_NAME: ${{ github.event.repository.name }} +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. check-for-duplicates: diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index acd672db8..c82894c79 100644 --- a/.github/workflows/build-deploy-doc.yml +++ b/.github/workflows/build-deploy-doc.yml @@ -30,6 +30,11 @@ on: required: false default: true +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: # Checks for duplicate actions. Skips push actions if there is a matching or # duplicate pull-request action. diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index c809413ea..5bb79a99e 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -4,6 +4,11 @@ on: push: pull_request: +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: # Checks for duplicate actions. Skips push actions if there is a matching or # duplicate pull-request action. diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml index 5087dc94e..993d40dcf 100644 --- a/.github/workflows/build-run-app.yml +++ b/.github/workflows/build-run-app.yml @@ -15,6 +15,11 @@ on: required: false default: '' +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: # Checks for duplicate actions. Skips push actions if there is a matching or # duplicate pull-request action. diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index c14f1b73e..fc3f9f802 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -4,6 +4,11 @@ name: Changelog on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash jobs: build: @@ -31,4 +36,4 @@ jobs: with: name: "Changelog" path: CHANGELOG.md - \ No newline at end of file + diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml index 1abd5dc78..f88488e61 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-reusable.yml @@ -40,6 +40,11 @@ on: default: false required: false +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + env: SIMULATION: native ENABLE_UNIT_TESTS: ${{inputs.test}} diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index fc73e256e..2abe417c0 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -5,6 +5,11 @@ on: push: pull_request: workflow_call: + +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. diff --git a/.github/workflows/static-analysis-misra.yml b/.github/workflows/static-analysis-misra.yml index 0c513f228..a3dd0347c 100644 --- a/.github/workflows/static-analysis-misra.yml +++ b/.github/workflows/static-analysis-misra.yml @@ -4,6 +4,11 @@ name: Static Analysis with MISRA on: workflow_dispatch: +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. check-for-duplicates: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 0e6d1f6b9..decb2fda6 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -8,6 +8,11 @@ on: type: string default: '' +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. check-for-duplicates: diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml index 474bfd438..de9aa0a34 100644 --- a/.github/workflows/unit-test-coverage.yml +++ b/.github/workflows/unit-test-coverage.yml @@ -20,6 +20,11 @@ on: required: false default: 0 +# Force bash to apply pipefail option so pipeline failures aren't masked +defaults: + run: + shell: bash + jobs: # Checks for duplicate actions. Skips push actions if there is a matching or # duplicate pull-request action. From 27d7cd2bfc01019fa549632d2172c95e5368e779 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 28 Jul 2022 11:16:09 -0400 Subject: [PATCH 2/2] IC: Caelum-rc4+dev14 *Combines:* osal v6.0.0-rc4+dev97 **Includes:** - nasa/osal#1272, Ensure address alignment of TCB for VxWorks 7 Co-authored by: Jacob Hageman --- osal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osal b/osal index 1de47bb10..bafbedeae 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 1de47bb10050b9bdae46974f24a34281b53e4949 +Subproject commit bafbedeaec9f4bc13a009a345ba869c9786eef7e