Merge pull request #83 from nasa/integration-candidate

sch_lab Integration candidate: 2021-06-22

.github/workflows/codeql-build.yml

@@ -2,19 +2,76 @@ name: "CodeQL Analysis"
 
 on:
   push:
+  pull_request:
     branches:
       - main
-  pull_request:
 
 env:
   SIMULATION: native
   ENABLE_UNIT_TESTS: true
   OMIT_DEPRECATED: true
   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/sch_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 sch_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 change the list of packets that sch_lab sends out, edit the schedule table lo
 
 ## Version History
 
+### Development Build: v2.4.0-rc1+dev40
+
+-  Implement Coding Standard in CodeQL workflow
+- See <https://github.com/nasa/sch_lab/pull/83> and <https://github.com/nasa/cFS/pull/270>
+
 ### Development Build: v2.4.0-rc1+dev36
 
 - Fix infinite loop by making sch_lab exit by making "RunStatus" return ERROR if initialization fails. This causes the `CFE_ES_RunLoop` function to return false.
@@ -25,70 +30,70 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 
 ### Development Build: v2.4.0-rc1+dev26
 
-- Fix #67, Update sequence count in transmitted messages
-- Fix #69, Add Testing Tools to the Security Policy
+- Update sequence count in transmitted messages
+- Add Testing Tools to the Security Policy
 - See <https://github.com/nasa/sch_lab/pull/71>
 
-### Development Build: 2.4.0-rc1+dev12
+### Development Build: v2.4.0-rc1+dev12
 
 - 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/sch_lab/pull/59>
 
-### Development Build: 2.4.0-rc1+dev9
+### Development Build: v2.4.0-rc1+dev9
 
 - Update to use MSG module. Replaces deprecated SB APIs with MSG
 - See <https://github.com/nasa/sch_lab/pull/58>
 
-### Development Build: 2.4.0-rc1+dev6
+### Development Build: v2.4.0-rc1+dev6
 
 - Adds header guard (the other warning on the ticket was already resolved)
 - See <https://github.com/nasa/sch_lab/pull/53>
 
-### Development Build: 2.4.0-rc1+dev2
+### Development Build: v2.4.0-rc1+dev2
 
 - Reorganize the sch_lab table so it matches the sample_app usage and format.
 - See <https://github.com/nasa/sch_lab/pull/52>
 
-### Development Build: 2.3.0+dev37
+### Development Build: v2.3.0+dev37
 
 - Fixes schedule table documentation
 - Add baseline and build number to version reporting
 - See <https://github.com/nasa/sch_lab/pull/48>
 
-### Development Build: 2.3.7
+### Development Build: v2.3.7
 
 - 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.
 - See <https://github.com/nasa/sch_lab/pull/41>
 
-### Development Build: 2.3.6
+### Development Build: v2.3.6
 
 - 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.
 - See <https://github.com/nasa/sch_lab/pull/39>
 
-### Development Build: 2.3.5
+### Development Build: v2.3.5
 
 - Improved table handling
 - sch_lab now builds on Raspbian OS
 - Minor updates (see <https://github.com/nasa/sch_lab/pull/36>)
 
-### Development Build: 2.3.4
+### Development Build: v2.3.4
 
 - Fix for clean build with OMIT_DEPRECATED
 - Minor updates (see <https://github.com/nasa/sch_lab/pull/35>)
 
-  ### Development Build: 2.3.3
+### Development Build: v2.3.3
 
 - Minor updates (see <https://github.com/nasa/sch_lab/pull/28>)
 
-  ### Development Build: 2.3.2
+### Development Build: v2.3.2
 
 - Table definition include update (see <https://github.com/nasa/sch_lab/pull/18>)
 
-  ### Development Build: 2.3.1
+### Development Build: v2.3.1
 
 - Minor updates (see <https://github.com/nasa/sch_lab/pull/16>)
 
-### _**OFFICIAL RELEASE: 2.3.0 - Aquila**_
+### _**OFFICIAL RELEASE: v2.3.0 - Aquila**_
 
 - Minor updates (see <https://github.com/nasa/sch_lab/pull/13>)
 - Not backwards compatible with OSAL 4.2.1

fsw/src/sch_lab_version.h

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