Merge pull request #1249 from skliper/fix1225-codeql_workflow

Fix #1225, Update codeql workflows for reusable update
nasa · May 2, 2022 · a0ec380 · a0ec380
2 parents 4c08633 + 05e4817
commit a0ec380
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/codeql-cfe-build.yml b/.github/workflows/codeql-cfe-build.yml
@@ -9,7 +9,5 @@ jobs:
     name: CodeQl Analysis
     uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
     with: 
-      make: 'make -j native/default_cpu1/osal/'
       component-path: osal
-      test: true
-
+      make: 'make -C build/native/default_cpu1/osal'
diff --git a/.github/workflows/codeql-osal-default.yml b/.github/workflows/codeql-osal-default.yml
@@ -7,8 +7,9 @@ on:
 jobs:
   codeql:
     name: CodeQl Analysis
-    uses: nasa/cFS/.github/workflows/codeql-build.yml@main
+    uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
     with: 
-      setup: 'cd osal && cp Makefile.sample Makefile'
-      make-prep: 'cd osal && make prep'
-      make: 'cd osal && make -j'
+      component-path: cFS  # Causes reusable workflow to not checkout bundle
+      setup: 'cp Makefile.sample Makefile'
+      prep: 'make prep'
+      make: 'make'