Skip to content

Commit

Permalink
Merge pull request #231 from gregmedd/release/1.0.0/ci-update-match-d…
Browse files Browse the repository at this point in the history
…ocumentation

Use the same build commands in CI as listed in README
  • Loading branch information
gregmedd authored Jul 12, 2024
2 parents a5a29eb + a9b92a5 commit 811ca7d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
shell: bash
run: |
cd up-cpp
conan install . --build=missing
cd build
cmake -S .. -DCMAKE_TOOLCHAIN_FILE=Release/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=yes
conan install --build=missing .
cmake --preset conan-release -DCMAKE_EXPORT_COMPILE_COMMANDS=yes
cd build/Release
cmake --build . -- -j
- name: Save conan cache to archive
Expand All @@ -59,13 +59,13 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: up-cpp/build
path: up-cpp/build/Release

- name: Upload compile commands
uses: actions/upload-artifact@v4
with:
name: compile-commands
path: up-cpp/build/compile_commands.json
path: up-cpp/build/Release/compile_commands.json

- name: Upload conan cache for linting
uses: actions/upload-artifact@v4
Expand All @@ -83,12 +83,12 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: up-cpp/build
path: up-cpp/build/Release

- name: Run all tests
shell: bash
run: |
cd up-cpp/build
cd up-cpp/build/Release
chmod +x bin/*
ctest
Expand All @@ -97,7 +97,7 @@ jobs:
if: success() || failure()
with:
name: test-results
path: 'up-cpp/build/test/results/*.xml'
path: 'up-cpp/build/Release/test/results/*.xml'

# NOTE: Run dynamic analysis in unit tests
memcheck:
Expand All @@ -110,7 +110,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: up-cpp/build
path: up-cpp/build/Release

- name: Install Valgrind
run: |
Expand All @@ -120,7 +120,7 @@ jobs:
- name: Run Valgrind Memcheck
continue-on-error: true
run: |
cd up-cpp/build
cd up-cpp/build/Release
chmod +x bin/*
mkdir -p valgrind_logs
: > valgrind_logs/valgrind_memcheck_summary.log
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
if: success() || failure()
with:
name: valgrind-memcheck-log
path: up-cpp/build/valgrind_logs/valgrind_complete_memcheck_log.log
path: up-cpp/build/Release/valgrind_logs/valgrind_complete_memcheck_log.log

threadcheck:
name: Run Valgrind ThreadCheck
Expand All @@ -178,7 +178,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: up-cpp/build
path: up-cpp/build/Release

- name: Install Valgrind
run: |
Expand All @@ -188,7 +188,7 @@ jobs:
- name: Run Valgrind ThreadCheck
continue-on-error: true
run: |
cd up-cpp/build
cd up-cpp/build/Release
chmod +x bin/*
mkdir -p valgrind_logs
: > valgrind_logs/valgrind_threadcheck_summary.log
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
if: success() || failure()
with:
name: valgrind-threadcheck-log
path: up-cpp/build/valgrind_logs/valgrind_complete_threadcheck_log.log
path: up-cpp/build/Release/valgrind_logs/valgrind_complete_threadcheck_log.log

helgrind:
name: Run Valgrind Helgrind
Expand All @@ -247,7 +247,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: up-cpp/build
path: up-cpp/build/Release

- name: Install Valgrind
run: |
Expand All @@ -257,7 +257,7 @@ jobs:
- name: Run Valgrind Helgrind
continue-on-error: true
run: |
cd up-cpp/build
cd up-cpp/build/Release
chmod +x bin/*
mkdir -p valgrind_logs
: > valgrind_logs/valgrind_helgrind_summary.log
Expand Down Expand Up @@ -304,7 +304,7 @@ jobs:
if: success() || failure()
with:
name: valgrind-helgrind-log
path: up-cpp/build/valgrind_logs/valgrind_complete_helgrind_log.log
path: up-cpp/build/Release/valgrind_logs/valgrind_complete_helgrind_log.log

dhat:
name: Run Valgrind DHAT
Expand All @@ -316,7 +316,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-artifacts
path: up-cpp/build
path: up-cpp/build/Release

- name: Install Valgrind
run: |
Expand All @@ -326,7 +326,7 @@ jobs:
- name: Run Valgrind DHAT
continue-on-error: true
run: |
cd up-cpp/build
cd up-cpp/build/Release
chmod +x bin/*
mkdir -p valgrind_logs
: > valgrind_logs/valgrind_dhat_summary.log
Expand Down Expand Up @@ -373,7 +373,7 @@ jobs:
if: success() || failure()
with:
name: valgrind-dhat-log
path: up-cpp/build/valgrind_logs/valgrind_complete_dhat_log.log
path: up-cpp/build/Release/valgrind_logs/valgrind_complete_dhat_log.log

lint:
name: Lint C++ sources
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ jobs:
shell: bash
run: |
cd up-cpp
conan install . --build=missing
cd build
cmake -S .. -DCMAKE_TOOLCHAIN_FILE=Release/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=yes
conan install --build=missing .
cmake --preset conan-release -DCMAKE_EXPORT_COMPILE_COMMANDS=yes
cd build/Release
cmake --build . -- -j
- name: Perform CodeQL Analysis
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
test:
name: Generate Test Coverage eport
name: Generate Test Coverage Report
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -48,26 +48,26 @@ jobs:
shell: bash
run: |
cd up-cpp
conan install . --build=missing
cd build
cmake -S .. -DCMAKE_TOOLCHAIN_FILE=Release/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Coverage
conan install --build=missing .
cd build/Release
cmake -S ../../ -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Coverage
cmake --build . -- -j
- name: Run all tests
shell: bash
run: |
cd up-cpp/build
cd up-cpp/build/Release
chmod +x bin/*
ctest || true
- name: Run Coverage report
shell: bash
run: |
cd up-cpp/build/
mkdir -p ./Coverage
gcovr -r .. --html --html-details -o ./Coverage/index.html -e '.*test.*'
cd up-cpp/build/Release
mkdir -p ../Coverage
gcovr -r ../../ --html --html-details -o ../Coverage/index.html -e '.*test.*'
cd ..
echo "Coverage report can be found here: ./Coverage/index.html"
echo "Coverage report can be found here: ../Coverage/index.html"
- name: Extract and Print Coverage Percentage
shell: bash
Expand All @@ -79,7 +79,7 @@ jobs:
- name: Upload test results
- name: Upload coverage report
uses: actions/upload-artifact@v4
if: success() || failure()
with:
Expand Down

0 comments on commit 811ca7d

Please sign in to comment.