Merge pull request #677 from nasa/integration-candidate

IC: Caelum-rc4+dev52
nasa · Jun 1, 2023 · 30b5527 · 30b5527
2 parents 6cded58 + dd8dbfb
commit 30b5527
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml
@@ -198,7 +198,7 @@ jobs:
             fi
             counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
             echo "Waiting for CFE Tests"
-            sleep 60
+            sleep 120
           done
 
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002

diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml
@@ -196,7 +196,7 @@ jobs:
             fi
             counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
             echo "Waiting for CFE Tests"
-            sleep 60
+            sleep 120
           done
 
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002

diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
@@ -61,14 +61,6 @@ jobs:
           name: style_differences
           path: style_differences.txt
 
-      - name: Error on differences
-        run: |
-          if [[ -s style_differences.txt ]];
-          then
-            cat style_differences.txt
-            exit -1
-          fi
-
   check-commit-message:
     name: Check Commit Message
     needs: check-for-duplicates

diff --git a/cfe b/cfe
diff --git a/osal b/osal