Skip to content

Commit f6bfdc0

Browse files
committed
Use new tools on CI
1 parent ca0d772 commit f6bfdc0

3 files changed

Lines changed: 25 additions & 12 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- uses: actions/setup-python@v5
22-
with: {python-version: "3.8"}
22+
with: {python-version: "3.10"}
2323

2424
- name: Install codespell
2525
run: pip3 install codespell
2626

2727
- name: Lint
2828
if: always()
2929
working-directory: asio
30-
run: cmake -D FORMAT_COMMAND=clang-format-14 -P cmake/lint.cmake || echo ignored
30+
run: cmake -D FORMAT_COMMAND=clang-format-15 -P cmake/lint.cmake || echo ignored
3131

3232
- name: Spell check
3333
if: always()
@@ -78,7 +78,7 @@ jobs:
7878

7979
runs-on: ubuntu-22.04
8080

81-
env: {CXX: clang++-14}
81+
env: {CXX: clang++-15}
8282

8383
steps:
8484
- uses: actions/checkout@v4
@@ -117,11 +117,11 @@ jobs:
117117
- name: Install static analyzers
118118
if: matrix.os == 'ubuntu-22.04'
119119
run: >-
120-
sudo apt-get install clang-tidy-14 cppcheck -y -q
120+
sudo apt-get install clang-tidy-15 cppcheck -y -q
121121
122122
sudo update-alternatives --install
123123
/usr/bin/clang-tidy clang-tidy
124-
/usr/bin/clang-tidy-14 140
124+
/usr/bin/clang-tidy-15 150
125125
126126
- name: Setup MultiToolTask
127127
if: matrix.os == 'windows-2022'
@@ -171,7 +171,7 @@ jobs:
171171
- uses: actions/checkout@v4
172172

173173
- uses: actions/setup-python@v5
174-
with: {python-version: "3.8"}
174+
with: {python-version: "3.10"}
175175

176176
- name: Install m.css dependencies
177177
run: pip3 install jinja2 Pygments

asio/CMakePresets.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"version": 2,
2+
"version": 3,
33
"cmakeMinimumRequired": {
44
"major": 3,
5-
"minor": 14,
5+
"minor": 21,
66
"patch": 0
77
},
88
"configurePresets": [
@@ -64,6 +64,11 @@
6464
"-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now",
6565
"CMAKE_SHARED_LINKER_FLAGS":
6666
"-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now"
67+
},
68+
"condition": {
69+
"type": "equals",
70+
"lhs": "${hostSystemName}",
71+
"rhs": "Linux"
6772
}
6873
},
6974
{
@@ -72,6 +77,11 @@
7277
"cacheVariables": {
7378
"CMAKE_CXX_FLAGS":
7479
"-fstack-protector-strong -fcf-protection=full -Wall -Wextra -Wpedantic -Wno-conversion -Wno-sign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast"
80+
},
81+
"condition": {
82+
"type": "equals",
83+
"lhs": "${hostSystemName}",
84+
"rhs": "Darwin"
7585
}
7686
},
7787
{
@@ -83,6 +93,11 @@
8393
"CMAKE_CXX_FLAGS":
8494
"/sdl /guard:cf /utf-8 /diagnostics:caret /w14165 /w44242 /w44254 /w44263 /w34265 /w34287 /w44296 /w44365 /w44388 /w44464 /w14545 /w14546 /w14547 /w14549 /w14555 /w34619 /w34640 /w24826 /w14905 /w14906 /w14928 /w45038 /W4 /permissive- /volatile:iso /Zc:inline /Zc:preprocessor /Zc:enumTypes /Zc:lambda /Zc:__cplusplus /Zc:externConstexpr /Zc:throwingNew /EHsc",
8595
"CMAKE_EXE_LINKER_FLAGS": "/machine:x64 /guard:cf"
96+
},
97+
"condition": {
98+
"type": "equals",
99+
"lhs": "${hostSystemName}",
100+
"rhs": "Windows"
86101
}
87102
},
88103
{

asio/GNUmakefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
.PHONY: all check clean
22
all: .init
3-
cmake --preset dev
4-
cmake --build --preset dev
5-
ninja -C build/dev all_verify_interface_header_sets
3+
cmake --workflow --preset dev
64

75
check:
86
ninja -C build/dev spell-check
97
ninja -C build/dev format-check
108

119
.init: requirements.txt
12-
pip3 install -U -r requirements.txt
10+
-pip3 install --user --upgrade -r requirements.txt
1311
touch .init
1412

1513
clean:

0 commit comments

Comments
 (0)