Merge remote-tracking branch 'upstream/devel' into work/DpCatalog

Author: timcanham

.github/DISCUSSION_TEMPLATE/pattern-request.yml

@@ -0,0 +1,34 @@
+title: "[Summarize the pattern. Be as clear and concise as possible.] "
+labels: ["ROSES"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!TIP]
+        > The **Title** may be the only thing the community sees when voting on your pattern.
+       
+        This work is funded through [NASA ROSES](https://github.com/nasa/fprime/discussions/3041).
+  - type: textarea
+    id: pattern
+    attributes:
+      label: Pattern
+      description: "Describe what you want documented."
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        > [!TIP]
+        > Describe the **Pattern** without trying to sell it. Describe what you need.
+  - type: textarea
+    id: rationale
+    attributes:
+      label: Rationale
+      description: "(Optional) Describe why you want it documented. Sell it to the community."
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        > [!TIP]        
+        > Use the **Rationale** to sell your idea to the community. Describe why you need this.

.github/actions/spelling/expect.txt

@@ -24,7 +24,7 @@ ANamespace
 anotherchan
 anotherparam
 apad
-APID
+apid
 APIDOCS
 aports
 apos
@@ -362,14 +362,17 @@ genshi
 getblocks
 getchildren
 getcontext
+getcrc
 getdata
 getdefaultencoding
 getextern
 getf
 geti
 getinput
+getlength
 getm
 getquaternion
+getstart
 gett
 gettime
 getty
@@ -517,6 +520,7 @@ listdir
 Listst
 LJR
 lld
+llu
 LOCALSTATEDIR
 LOGGERRULES
 loglvl

.github/workflows/codeql-jpl-standard.yml

@@ -1,7 +1,7 @@
 # Semantic code analysis with CodeQL 
 # see https://github.com/github/codeql-action
 
-name: "JPL Coding Standard Scan"
+name: "Code Scan: JPL Coding Standard"
 
 on:
   push:

.github/workflows/codeql-security-scan.yml

@@ -1,7 +1,7 @@
 # Semantic code analysis with CodeQL 
 # see https://github.com/github/codeql-action
 
-name: "CodeQL Security Scan"
+name: "Code Scan: CodeQL Security"
 
 on:
   push:

.github/workflows/cookiecutters-test.yml

@@ -20,8 +20,23 @@ on:
 
 jobs:
 
+  # -------- Retrieve target branches for fprime-tools and fprime-bootstrap --------
+  get-tools-branch:
+    name: "Get fprime-tools target branch"
+    uses: ./.github/workflows/reusable-get-pr-branch.yml
+    with:
+      target_repository: nasa/fprime-tools
+
+  get-bootstrap-branch:
+    name: "Get fprime-bootstrap target branch"
+    uses: ./.github/workflows/reusable-get-pr-branch.yml
+    with:
+      target_repository: nasa/fprime-bootstrap
+
+  # -------- Install target versions of the cookiecutter templates and validate -------
   Validate:
     runs-on: ubuntu-latest
+    needs: [ get-tools-branch, get-bootstrap-branch ]
     steps:
       # Checkout only the bootstrap.expect file, since the full F´ repo will be 
       # checked out as part of the fprime-bootstrap process
@@ -38,11 +53,12 @@ jobs:
         with:
           python-version: '3.11'
 
-      - name: "Install expect and fprime-bootstrap@devel"
+      - name: "Install expect and fprime-bootstrap"
         run: |
+             sudo apt-get update
              sudo apt-get install expect
-             pip install git+https://github.com/fprime-community/fprime-bootstrap@devel
-      
+             pip install git+https://github.com/fprime-community/fprime-bootstrap@${{ needs.get-bootstrap-branch.outputs.target-branch }}
+
       - name: "Bootstrap Project"
         run: |
              expect .github/actions/cookiecutter-check/bootstrap.expect
@@ -56,12 +72,12 @@ jobs:
           path: ./MyProject/lib/fprime
           fetch-depth: 0
 
-      - name: "Update dependencies and install fprime-tools@devel"
+      - name: "Update dependencies and install fprime-tools"
         run: |
              cd MyProject
              . fprime-venv/bin/activate
              pip install -U -r ./lib/fprime/requirements.txt
-             pip install git+https://github.com/nasa/fprime-tools@devel
+             pip install git+https://github.com/nasa/fprime-tools@${{ needs.get-tools-branch.outputs.target-branch }}
 
       - name: "Version Check"
         run: |

.github/workflows/cppcheck-scan.yml

@@ -1,5 +1,5 @@
 # Adapted from https://github.com/nasa/cFS/blob/c36aa2c1df0fb47a3838577908af3d0d0ab0ef54/.github/workflows/static-analysis.yml
-name: "Cppcheck Scan"
+name: "Code Scan: CppCheck"
 
 on:
   push:
@@ -31,7 +31,7 @@ jobs:
       - uses: ./.github/actions/setup
 
       - name: Install cppcheck
-        run: sudo apt-get install cppcheck xsltproc -y
+        run: sudo apt-get update && sudo apt-get install cppcheck xsltproc -y
 
       - name: Install sarif tool
         run: npm i -g @microsoft/sarif-multitool

.github/workflows/cpplint-scan.yml

@@ -1,4 +1,4 @@
-name: "Cpplint Scan"
+name: "Code Scan: Cpplint"
 
 on:
   push:
@@ -33,7 +33,7 @@ jobs:
         run: pip install cpplint
 
       - name: Install xsltproc
-        run: sudo apt-get install xsltproc -y
+        run: sudo apt-get update && sudo apt-get install xsltproc -y
 
       - name: Install sarif tool
         run: npm i -g @microsoft/sarif-multitool

.github/workflows/ext-build-examples-repo.yml

@@ -0,0 +1,34 @@
+# Builds and runs UTs on https://github.com/fprime-community/fprime-examples
+
+name: "External Repo: fprime-examples"
+
+on:
+  push:
+    branches: [ devel, release/**, ci/** ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ devel, release/** ]
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - '.github/actions/spelling/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.gitignore'
+
+jobs:
+  get-branch:
+    name: "Get target branch"
+    uses: ./.github/workflows/reusable-get-pr-branch.yml
+    with:
+      target_repository: nasa/fprime-examples
+
+  run:
+    needs: get-branch
+    name: ""
+    uses: ./.github/workflows/reusable-project-builder.yml
+    with: 
+      target_repository: nasa/fprime-examples
+      build_location: FlightExamples
+      run_unit_tests: true
+      target_ref: ${{ needs.get-branch.outputs.target-branch }}
+      fprime_location: ./FlightExamples/lib/fprime

.github/workflows/ext-build-hello-world.yml

@@ -1,6 +1,6 @@
 # Builds and runs UTs on https://github.com/fprime-community/fprime-tutorial-hello-world
 
-name: "Tutorial: HelloWorld"
+name: "External Repo: Tutorial: HelloWorld"
 
 on:
   push:

.github/workflows/ext-build-led-blinker.yml

@@ -1,6 +1,6 @@
 # Builds and runs UTs on https://github.com/fprime-community/fprime-workshop-led-blinker
 
-name: "Tutorial: LedBlinker"
+name: "External Repo: Tutorial: LedBlinker"
 
 on:
   push: