Skip to content

Commit

Permalink
switch to ubuntu 24 (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
BenniWi authored Jan 2, 2025
1 parent ab5c927 commit de5ad53
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "benniwi/learn2code:base",
"image": "benniwi/learn2code:24.04_base",

// Configure tool-specific properties.
"customizations": {
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_and_test_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
path: windows_binary_dir

build_macos:
runs-on: macos-11
runs-on: macos-15

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-format_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ jobs:
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/[email protected]
with:
clang-format-version: '10'
clang-format-version: '18'
check-path: '.'
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ cmake_minimum_required(VERSION 3.20)

project(learn2code_demo_1 LANGUAGES C CXX)

add_subdirectory(./code)
add_subdirectory(./code)
enable_testing()
1 change: 1 addition & 0 deletions code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit de5ad53

Please sign in to comment.