Skip to content

Commit

Permalink
Update sanitizer workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
bernedom committed Sep 16, 2024
1 parent 0fe19eb commit 50cccc8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4

- name: install-python-3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
- uses: actions/checkout@v4

- name: install-python-3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4

- name: install-python-3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v4

- name: install-python-3
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down Expand Up @@ -90,5 +90,5 @@ jobs:
set PATH="%PATH%;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.40.33807\bin\Hostx64\x64;C:\Program Files\CMake\bin"
echo %PATH%
"C:\Program Files\CMake\bin\ctest.exe" -V -C Debug
"C:\Program Files\CMake\bin\ctest.exe" -V -C Debug --output-on-failure
shell: cmd
13 changes: 3 additions & 10 deletions chapter05/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,9 @@ add_subdirectory(find_module)
add_subdirectory(fetch_content_example)
add_subdirectory(external_project)

# Look for the conan command on the host system, if conan is not found
# exclude all conan related examples from the project
find_program(CONAN_EXECUTABLE conan)

if(CONAN_EXECUTABLE)
# add_subdirectory(conan_example)
# add_subdirectory(conan_conanfile_example)
else()
message(STATUS "Conan not found. Will not build conan examples")
endif()
# the subproject conan_example is supposed to be run as a standalone project
# as it illustrates using conan as a dependency provider which requires inclusion
# of conan.cmake at the root of the project

# Look for the vcpkg executable on the host system, if vcpkg is not found
# exclude all vcpkg-related examples from the project
Expand Down

0 comments on commit 50cccc8

Please sign in to comment.