diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index f5a04854..3712492d 100644 --- a/.github/workflows/codeql-build.yml +++ b/.github/workflows/codeql-build.yml @@ -11,8 +11,68 @@ env: BUILDTYPE: release 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 + # Map a step output to a job output + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip }} + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@master + with: + concurrent_skipping: 'same_content' + skip_after_successful_duplicate: 'true' + do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]' + + CodeQL-Security-Build: + needs: check-for-duplicates + if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} + runs-on: ubuntu-18.04 + timeout-minutes: 15 + + steps: + # Checks out a copy of your repository on the ubuntu-latest machine + - name: Checkout bundle + uses: actions/checkout@v2 + with: + repository: nasa/cFS + submodules: true + + - name: Checkout submodule + uses: actions/checkout@v2 + with: + path: psp + + - name: Check versions + run: git submodule + + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: c + config-file: nasa/cFS/.github/codeql/codeql-security.yml@main + + # Setup the build system + - name: Set up for build + run: | + cp ./cfe/cmake/Makefile.sample Makefile + cp -r ./cfe/cmake/sample_defs sample_defs + make prep + + # Build the code + - name: Build + run: | + make psp-pc-linux + make native/default_cpu1/psp/unit-test-coverage/ + make native/default_cpu1/psp/ut-stubs/ + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 - CodeQL-Build: + CodeQL-Coding-Standard-Build: + needs: check-for-duplicates + if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} runs-on: ubuntu-18.04 timeout-minutes: 15 @@ -36,7 +96,7 @@ jobs: uses: github/codeql-action/init@v1 with: languages: c - queries: +security-extended, security-and-quality + config-file: nasa/cFS/.github/codeql/codeql-coding-standard.yml@main # Setup the build system - name: Set up for build diff --git a/README.md b/README.md index fcb0630f..047fef61 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ This is a collection of APIs abstracting platform specific functionality to be l ## Version History +### Development Build: v1.5.0-rc1+dev118 + +- Implement Coding Standards in CodeQL +- rename doc to docs +- See and ### Development Build: v1.5.0-rc1+dev112 diff --git a/doc/PSP 1.3.0.0 Version Description Document.docx b/docs/PSP 1.3.0.0 Version Description Document.docx similarity index 100% rename from doc/PSP 1.3.0.0 Version Description Document.docx rename to docs/PSP 1.3.0.0 Version Description Document.docx diff --git a/doc/PSP 1.3.0.0 Version Description Document.pdf b/docs/PSP 1.3.0.0 Version Description Document.pdf similarity index 100% rename from doc/PSP 1.3.0.0 Version Description Document.pdf rename to docs/PSP 1.3.0.0 Version Description Document.pdf diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index 2e35b6d9..46923374 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 112 +#define CFE_PSP_IMPL_BUILD_NUMBER 118 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1" /* diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index 3f98ceb4..4c999859 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 112 +#define CFE_PSP_IMPL_BUILD_NUMBER 118 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1" /* diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 4bcecbdc..ebe85679 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -29,7 +29,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 112 +#define CFE_PSP_IMPL_BUILD_NUMBER 118 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1" /*