Fix the Manifest Parser

.devcontainer/devcontainer.json

@@ -9,8 +9,7 @@
         "-e DISPLAY" // Makes DISPLAY environment variable available in the container.
         // "-v /tmp/.X11-unix:/tmp/.X11-unix" // Required for container to access display.
     ],
-    // "image": "ghcr.io/missourimrdt/rovecomm-jammy:latest",
-    "image": "ghcr.io/missourimrdt/rovecomm-focal:latest",
+    "image": "ghcr.io/missourimrdt/rovecomm-jammy:latest",
     // "image": "ghcr.io/missourimrdt/rovecomm-jetpack:latest",
     // "build": {
     //     "dockerfile": "Dockerfile_Jammy"

.github/workflows/manifest.yml

@@ -1,37 +1,48 @@
 name: Update Manifest Header
 
 on:
-  issue_comment:
-    types: [created, edited, deleted]
+  pull_request:
+    branches: ["development"]
+    paths:
+      - "data/RoveComm/manifest.json"
+      - "tools/RoveComm/parser.py"
+      - "src/RoveComm/RoveCommManifest.h"
+      - ".github/workflows/manifest.yml"
 
 concurrency:
   group: "manifest-generator"
   cancel-in-progress: true
 
 jobs:
   update-manifest:
-    if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/update-manifest') }}
     runs-on: ubuntu-latest
     steps:
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
-      - name: Update Branch
-        uses: actions/checkout@v3
+      - name: Pull Repo
+        uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-          token: ${{ github.token }}
-          ref: ${{ steps.extract_branch.outputs.branch }}
+          submodules: "recursive"
+
+      - name: Setup Git
+        run: |
+          git config user.name "MissouriMRDT"
+          git config user.email "[email protected]"
+
+      - name: Rebase Changes
+        run: |
+          git fetch origin ${{ github.head_ref }}
+          git rebase origin/${{ github.head_ref }}
 
-      - name: Generate Manifest and Commit
+      - name: Generate Manifest
         run: |
           git branch
           cd tools/RoveComm
           python parser.py
-          git config user.name "MissouriMRDT"
-          git config user.email "[email protected]"
-          git add -f ../../src/RoveComm/Manifest.h
-          git commit -m "** Automated - Manifest Update **"
-          git push
+
+      - name: Commit Manifest
+        run: |
+          git add -f src/RoveComm/RoveCommManifest.h
+          git commit -m "** Automated - Manifest Update **" || echo "No changes to commit"
+
+      - name: Push Changes
+        run: |
+          git push origin HEAD:${{ github.head_ref }} --force-with-lease || echo "Failed to push changes"

.gitignore

@@ -7,7 +7,7 @@ valgrind.rpt
 ### RoveComm ###\
 # Note: To limit local edits that get pushed and then overridden, we include this in the .gitignore.
 # However, the GitHub Action will be allowed to push by bypassing the .gitignore.
-Manifest.h
+RoveCommManifest.h
 
 # Documentation. This is a special rule that uses ! negations.
 docs/*

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "data/RoveComm"]
+	path = data/RoveComm
+	url = https://github.com/MissouriMRDT/RoveComm_Base
+    branch = embedded-2024