From fc3eee5dfb1f94ba7c19fa3e64635d10a903969d Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 20 Apr 2022 07:40:15 -0600 Subject: [PATCH] Fix #1225, Update codeql workflows for reusable update --- .github/workflows/codeql-cfe-build.yml | 4 +--- .github/workflows/codeql-osal-default.yml | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-cfe-build.yml b/.github/workflows/codeql-cfe-build.yml index 793e88978..9a4a5099e 100644 --- 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 - \ No newline at end of file + make: 'make -C build/native/default_cpu1/osal' diff --git a/.github/workflows/codeql-osal-default.yml b/.github/workflows/codeql-osal-default.yml index 0509f7280..2a53c56cb 100644 --- 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: + component-path: osal setup: 'cd osal && cp Makefile.sample Makefile' - make-prep: 'cd osal && make prep' - make: 'cd osal && make -j' \ No newline at end of file + prep: 'cd osal && make prep' + make: 'cd osal && make'