Merge pull request nasa#100 from nasa/integration-candidate

to_lab Integration candidate: 2021-06-22

.github/workflows/codeql-build.yml

@@ -2,9 +2,9 @@ name: "CodeQL Analysis"
 
 on:
  push:
+ pull_request:
  branches:
  - main
- pull_request:
 
 env:
  SIMULATION: native
@@ -13,8 +13,65 @@ 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: apps/to_lab
+
+ - 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 to_lab
+
+ - 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
 
@@ -38,7 +95,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

README.md

@@ -13,6 +13,11 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in
 
 ## Version History
 
+### Development Build: v2.4.0-rc1+dev49
+
+- Implement Coding Standard in CodeQL workflow
+- See <https://github.com/nasa/to_lab/pull/100> and <https://github.com/nasa/cFS/pull/270>
+
 ### Development Build: v2.4.0-rc1+dev47
 
 - Removes app registration call, `CFE_ES_RegisterApp()` since applications do not need to register themselves.
@@ -25,92 +30,92 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in
 
 ### Development Build: v2.4.0-rc1+dev38
 
-- Fix #85, Remove numeric pipe ID from event printf
-- Fix #87, Add Testing Tools to the Security Policy
+- Remove numeric pipe ID from event printf
+- Add Testing Tools to the Security Policy
 - See <https://github.com/nasa/to_lab/pull/89>
 
-### Development Build: 2.4.0-rc1+dev32
+### Development Build: v.2.4.0-rc1+dev32
 
 - Removes end-of-function comments in `to_lab_app.c`
 - Adds static analysis and code format check to continuous integration workflow. Updates workflow status badges in ReadMe
 - Adds CodeQL analysis to continuous integration workflow
 - See <https://github.com/nasa/to_lab/pull/84>
 
-### Development Build: 2.4.0-rc1+dev21
+### Development Build: v.2.4.0-rc1+dev21
 
 - TO remains command-able after a "remove all subscriptions" command; the command now only removes all subscriptions to the Tlm_pipe
 - See <https://github.com/nasa/to_lab/pull/75>
 
-### Development Build: 2.4.0-rc1+dev17
+### Development Build: v.2.4.0-rc1+dev17
 
 - Aligns messages according to changes in cFE <https://github.com/nasa/cFE/issues/1009>. Uses the "raw" message cmd/tlm types in definition
 - See <https://github.com/nasa/to_lab/pull/70>
 
-### Development Build: 2.4.0-rc1+dev13
+### Development Build: v.2.4.0-rc1+dev13
 
 - Replaces deprecated SB API's with MSG
 - See <https://github.com/nasa/to_lab/pull/65>
 
-### Development Build: 2.4.0-rc1+dev9
+### Development Build: v.2.4.0-rc1+dev9
 
 - Update the TLMsockid field to be `osal_id_t` instead of uint32
 - Set revision number to 99 to indicate development status in telemetry
 - See <https://github.com/nasa/to_lab/pull/59>
 
-### Development Build: 2.4.0-rc1+dev6
+### Development Build: v.2.4.0-rc1+dev6
 
 - Adds header guard to `to_lab_sub_table.h`
 - See <https://github.com/nasa/to_lab/pull/59>
 
-### Development Build: 2.4.0-rc1+dev3
+### Development Build: v.2.4.0-rc1+dev3
 
 - Remove reference to deprecated `CFE_ES_SHELL_TLM_MID`.
 - See <https://github.com/nasa/to_lab/pull/58>
 
-### Development Build: 2.3.0+dev45
+### Development Build: v2.3.0+dev45
 
 - Fixes bug where an unset address values caused subscriptions to MsgId 0 over 200 times. Added a `TO_UNUSED` entry at the end of the subscription list and a break in the subscription loop when `TO_UNUSED` found. No more subscriptions on the unused table slots (no MsgId 0 subscriptions).
 - Corrects return value of `TO_LAB_init()` to be `int32` instead of `int`. Declaration now matches definition, and app builds without errors.
 - Add build number and baseline to version reporting.
 - See <https://github.com/nasa/to_lab/pull/53>
 
-### Development Build: 2.3.7
+### Development Build: v2.3.7
 
 - Makes the `TO_LAB_Subs` table into a CFE_TBL-managed table.
 - See <https://github.com/nasa/to_lab/pull/46>
 
 
-### Development Build: 2.3.6
+### Development Build: v2.3.6
 
 - Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type.
 - See <https://github.com/nasa/to_lab/pull/44>
 
-### Development Build: 2.3.5
+### Development Build: v2.3.5
 
 - Apply code style
 - See <https://github.com/nasa/to_lab/pull/43>
 
-### Development Build: 2.3.4
+### Development Build: v2.3.4
 
 - Configure the maximum depth supported by OSAL, rather than a hard coded 64.
 - See <https://github.com/nasa/to_lab/pull/39>
 
-### Development Build: 2.3.3
+### Development Build: v2.3.3
 
 - Apply the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values.
 - Deprecates shell tlm subscription
 - Changes to documentation
 - See <https://github.com/nasa/to_lab/pull/38>
 
-### Development Build: 2.3.2
+### Development Build: v2.3.2
 
 - Use OSAL socket API instead of BSD Sockets
 
 - Use global namespace to isolate variables
 
 - Minor updates (see <https://github.com/nasa/to_lab/pull/27>)
 
-### Development Build: 2.3.1
+### Development Build: v2.3.1
 
 - Fix for a clean build with OMIT_DEPRECATED
 - Minor updates (see <https://github.com/nasa/to_lab/pull/26>)

fsw/src/to_lab_version.h

@@ -30,7 +30,7 @@
  */
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER 47 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER 49 /*!< Development Build: Number of commits since baseline */
 #define TO_LAB_BUILD_BASELINE \
  "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */