Fix #2034, Fix git error in CodeQL workflow

nasa · Jan 21, 2022 · 46eddc3 · 46eddc3
1 parent c1aa63d
commit 46eddc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml
@@ -3,11 +3,11 @@ name: "CodeQL Analysis"
 on:
   push:
   pull_request:
-  
+
 jobs:
   codeql:
-    name: CodeQL Analysis
-    uses: nasa/cFS/.github/workflows/codeql-build.yml@main
+    name: CodeQl Analysis
+    uses: astrogeco/cFS/.github/workflows/codeql-build.yml@fix-codeql-workflow
     with: 
-      make-prep: 'make prep'
-      make: 'make -C build/native/default_cpu1 core_api core_private es evs fs msg resourceid sb sbr tbl time'
+      make: 'make -C build/native/default_cpu1 core_api core_private es evs fs msg resourceid sb sbr tbl time'
+      component-path: cfe
diff --git a/cmake/Makefile.sample b/cmake/Makefile.sample
@@ -135,7 +135,7 @@ distclean:
 # Grab lcov baseline before running tests
 test:
 	lcov --capture --initial --directory $(O)/$(ARCH) --output-file $(O)/$(ARCH)/coverage_base.info
-	(cd $(O)/$(ARCH) && ctest -O ctest.log)
+	(cd $x(O)/$(ARCH) && ctest -O ctest.log)
 
 lcov:
 	lcov --capture --rc lcov_branch_coverage=1 --directory $(O)/$(ARCH) --output-file $(O)/$(ARCH)/coverage_test.info