diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f24f9c2..a90df76 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "image": "benniwi/learn2code:base", + "image": "benniwi/learn2code:24.04_base", // Configure tool-specific properties. "customizations": { diff --git a/.github/workflows/build_and_test_code.yml b/.github/workflows/build_and_test_code.yml index f7202cd..f13f4d6 100644 --- a/.github/workflows/build_and_test_code.yml +++ b/.github/workflows/build_and_test_code.yml @@ -15,7 +15,7 @@ jobs: # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. # You can convert this to a matrix build if you need cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 @@ -47,7 +47,7 @@ jobs: path: linux_binary_dir build_windows: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 @@ -75,7 +75,7 @@ jobs: path: windows_binary_dir build_macos: - runs-on: macos-11 + runs-on: macos-15 steps: diff --git a/.github/workflows/clang-format_checks.yml b/.github/workflows/clang-format_checks.yml index 76ec597..889aae3 100644 --- a/.github/workflows/clang-format_checks.yml +++ b/.github/workflows/clang-format_checks.yml @@ -15,5 +15,5 @@ jobs: - name: Run clang-format style check for C/C++/Protobuf programs. uses: jidicula/clang-format-action@v4.10.2 with: - clang-format-version: '10' + clang-format-version: '18' check-path: '.' \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index ea5e06c..751bcd4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -31,9 +31,9 @@ "[cpp]": { "editor.defaultFormatter": "xaver.clang-format" }, - "clang-format.executable": "clang-format", + "clang-format.executable": "clang-format-18", - "clang-tidy.executable": "clang-tidy", + "clang-tidy.executable": "clang-tidy-18", "clang-tidy.fixOnSave": true, "clang-tidy.lintOnSave": true, "clang-tidy.compilerArgs": [ diff --git a/CMakeLists.txt b/CMakeLists.txt index f0bd9a4..3dcc48f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,4 +2,5 @@ cmake_minimum_required(VERSION 3.20) project(learn2code_demo_1 LANGUAGES C CXX) -add_subdirectory(./code) \ No newline at end of file +add_subdirectory(./code) +enable_testing() \ No newline at end of file diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 5c314cb..c8801ba 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -37,6 +37,7 @@ target_link_libraries(demo_1_main PRIVATE uni_library) # installing targets install(TARGETS demo_1_main DESTINATION .) +include(CTest) if(NOT WIN32) # enable the testing enable_testing()