Skip to content

Commit 4065c99

Browse files
prince-chrismcprince-chrismc
authored
Merge branch 'master' into dev-ux
2 parents 5bae744 + 59cb1e6 commit 4065c99

File tree

8 files changed

+42
-37
lines changed

8 files changed

+42
-37
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
default-linux:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- uses: lukka/get-cmake@latest
2222

2323
- name: setup
@@ -34,7 +34,7 @@ jobs:
3434
default-linux-with-examples:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
- uses: lukka/get-cmake@latest
3939

4040
- name: setup
@@ -53,7 +53,7 @@ jobs:
5353
default-win:
5454
runs-on: windows-latest
5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5757
- uses: lukka/get-cmake@latest
5858
- run: choco install openssl
5959

@@ -73,7 +73,7 @@ jobs:
7373
min-req:
7474
runs-on: ubuntu-20.04
7575
steps:
76-
- uses: actions/checkout@v3
76+
- uses: actions/checkout@v4
7777
- uses: ./.github/actions/install/cmake
7878
with:
7979
version: "3.14.7"
@@ -119,7 +119,7 @@ jobs:
119119
custom-install-linux:
120120
runs-on: ubuntu-latest
121121
steps:
122-
- uses: actions/checkout@v3
122+
- uses: actions/checkout@v4
123123
- uses: lukka/get-cmake@latest
124124

125125
- name: setup
@@ -157,7 +157,7 @@ jobs:
157157
custom-install-win:
158158
runs-on: windows-latest
159159
steps:
160-
- uses: actions/checkout@v3
160+
- uses: actions/checkout@v4
161161
- uses: lukka/get-cmake@latest
162162
- run: choco install openssl
163163

@@ -177,7 +177,7 @@ jobs:
177177
no-pico:
178178
runs-on: ubuntu-latest
179179
steps:
180-
- uses: actions/checkout@v3
180+
- uses: actions/checkout@v4
181181
- uses: lukka/get-cmake@latest
182182

183183
- name: setup
@@ -196,7 +196,7 @@ jobs:
196196
no-base64:
197197
runs-on: ubuntu-latest
198198
steps:
199-
- uses: actions/checkout@v3
199+
- uses: actions/checkout@v4
200200
- uses: lukka/get-cmake@latest
201201

202202
- name: setup
@@ -215,7 +215,7 @@ jobs:
215215
with-libressl:
216216
runs-on: ubuntu-latest
217217
steps:
218-
- uses: actions/checkout@v3
218+
- uses: actions/checkout@v4
219219
- uses: lukka/get-cmake@latest
220220
- uses: ./.github/actions/install/libressl
221221

@@ -235,7 +235,7 @@ jobs:
235235
with-wolfssl:
236236
runs-on: ubuntu-latest
237237
steps:
238-
- uses: actions/checkout@v3
238+
- uses: actions/checkout@v4
239239
- uses: lukka/get-cmake@latest
240240
- uses: ./.github/actions/install/wolfssl
241241
with:
@@ -257,7 +257,7 @@ jobs:
257257
with-hunter: # This is actually testing the integration with the package management
258258
runs-on: ubuntu-latest
259259
steps:
260-
- uses: actions/checkout@v3
260+
- uses: actions/checkout@v4
261261
- uses: lukka/get-cmake@latest
262262

263263
- name: setup

‎.github/workflows/cross-platform.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- if: matrix.os == 'macos-latest'
1717
run: sudo cp /usr/local/opt/openssl@1.1/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/
1818

19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: configure
2222
run: cmake --preset examples

‎.github/workflows/documentation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- uses: ssciwr/doxygen-install@v1
1313
with:
1414
version: "1.10.0"

‎.github/workflows/jwt.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
coverage:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: lukka/get-cmake@latest
1515
- uses: ./.github/actions/install/gtest
1616
- uses: ./.github/actions/install/danielaparker-jsoncons
@@ -23,15 +23,16 @@ jobs:
2323
- name: run
2424
run: cmake --build --preset coverage
2525

26-
- uses: coverallsapp/github-action@1.1.3
26+
- uses: coverallsapp/github-action@v2
2727
with:
2828
github-token: ${{ secrets.GITHUB_TOKEN }}
29-
path-to-lcov: build/coverage.info
29+
file: build/coverage.info
30+
format: lcov
3031

3132
fuzzing:
3233
runs-on: ubuntu-latest
3334
steps:
34-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3536
- uses: lukka/get-cmake@latest
3637

3738
- name: configure
@@ -54,7 +55,7 @@ jobs:
5455
- { tag: "openssl-3.0.5", name: "3.0.5" }
5556
- { tag: "OpenSSL_1_1_1q", name: "1.1.1q" }
5657
steps:
57-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5859
- uses: lukka/get-cmake@latest
5960
- uses: ./.github/actions/install/gtest
6061
- uses: ./.github/actions/install/openssl
@@ -76,7 +77,7 @@ jobs:
7677
ubsan:
7778
runs-on: ubuntu-latest
7879
steps:
79-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
8081
- uses: lukka/get-cmake@latest
8182
- uses: ./.github/actions/install/gtest
8283

‎.github/workflows/lint.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- run: |
2424
sudo apt-get install clang-format-14
2525
shopt -s globstar
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
- run: clang-format-14 -i ${{ matrix.files }}
2828
- uses: ./.github/actions/process-linting-results
2929
with:
@@ -41,7 +41,7 @@ jobs:
4141
python-version: "3.x"
4242
- run: pip install cmakelang
4343
- run: shopt -s globstar
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- run: cmake-format -i ${{ matrix.files }}
4646
- uses: ./.github/actions/process-linting-results
4747
with:
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353
- run: sudo apt-get install clang-tidy
5454
- uses: lukka/get-cmake@latest
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656
- name: configure
5757
run: cmake --preset examples -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-fix"
5858
- name: run
@@ -62,7 +62,7 @@ jobs:
6262
linter_name: clang-tidy
6363

6464
render-defaults:
65-
runs-on: ubuntu-20.04
65+
runs-on: ubuntu-22.04
6666
strategy:
6767
fail-fast: false
6868
matrix:
@@ -74,22 +74,24 @@ jobs:
7474
- { name: "open_source_parsers_jsoncpp", library: "jsoncpp", url: "https://github.com/open-source-parsers/jsoncpp", disable_pico: true }
7575
name: render-defaults (${{ matrix.traits.name }})
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
78+
- run: |
79+
sudo apt-get install clang-format-14
7880
- uses: ./.github/actions/render/defaults
7981
id: render
8082
with:
8183
traits_name: ${{ matrix.traits.name }}
8284
library_name: ${{ matrix.traits.library }}
8385
library_url: ${{ matrix.traits.url }}
8486
disable_default_traits: ${{ matrix.traits.disable_pico }}
85-
- run: clang-format -i ${{ steps.render.outputs.file_path }}
87+
- run: clang-format-14 -i ${{ steps.render.outputs.file_path }}
8688
- run: git add ${{ steps.render.outputs.file_path }}
8789
- uses: ./.github/actions/process-linting-results
8890
with:
8991
linter_name: render-defaults
9092

9193
render-tests:
92-
runs-on: ubuntu-20.04
94+
runs-on: ubuntu-22.04
9395
strategy:
9496
fail-fast: false
9597
matrix:
@@ -101,13 +103,15 @@ jobs:
101103
- { name: "open_source_parsers_jsoncpp", suite: "OspJsoncppTest" }
102104
name: render-tests (${{ matrix.traits.name }})
103105
steps:
104-
- uses: actions/checkout@v3
105-
- run: shopt -s globstar
106+
- uses: actions/checkout@v4
107+
- run: |
108+
sudo apt-get install clang-format-14
109+
shopt -s globstar
106110
- uses: ./.github/actions/render/tests
107111
with:
108112
traits_name: ${{ matrix.traits.name }}
109113
test_suite_name: ${{ matrix.traits.suite }}
110-
- run: clang-format -i tests/**/*.cpp
114+
- run: clang-format-14 -i tests/**/*.cpp
111115
- run: git add tests/traits/*
112116
- uses: ./.github/actions/process-linting-results
113117
with:
@@ -116,7 +120,7 @@ jobs:
116120
line-ending:
117121
runs-on: ubuntu-20.04
118122
steps:
119-
- uses: actions/checkout@v3
123+
- uses: actions/checkout@v4
120124
- run: git add --renormalize .
121125
- uses: ./.github/actions/process-linting-results
122126
with:

‎.github/workflows/ssl.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- { tag: "OpenSSL_1_0_1u", name: "1.0.1u" }
2020
name: OpenSSL ${{ matrix.openssl.name }}
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: lukka/get-cmake@latest
2424
- uses: ./.github/actions/install/gtest
2525
- uses: ./.github/actions/install/openssl
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343
name: OpenSSL 3.0 No Deprecated
4444
steps:
45-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4646
- uses: lukka/get-cmake@latest
4747
- uses: ./.github/actions/install/gtest
4848
- uses: ./.github/actions/install/openssl
@@ -61,7 +61,7 @@ jobs:
6161
libressl: ["3.5.3", "3.4.3", "3.3.6"]
6262
name: LibreSSL ${{ matrix.libressl }}
6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565
- uses: lukka/get-cmake@latest
6666
- uses: ./.github/actions/install/gtest
6767
- uses: ./.github/actions/install/libressl
@@ -90,7 +90,7 @@ jobs:
9090
- { ref: "v5.3.0-stable", name: "5.3.0"}
9191
name: wolfSSL ${{ matrix.wolfssl.name }}
9292
steps:
93-
- uses: actions/checkout@v3
93+
- uses: actions/checkout@v4
9494
- uses: lukka/get-cmake@latest
9595
- uses: ./.github/actions/install/gtest
9696
- uses: ./.github/actions/install/wolfssl

‎.github/workflows/targets.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- run: |
2727
apt-get update
2828
apt-get install -y g++-4.8 wget make libssl-dev
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v3 # Can not be upgrade as v4 needs NodeJS 20 doesn't exist next to gcc-4.8
3030
- uses: ./.github/actions/install/cmake
3131
with:
3232
version: "3.26.3"
@@ -57,7 +57,7 @@ jobs:
5757
- run: |
5858
apt-get update
5959
apt-get install -y g++-12 wget make libssl-dev
60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
6161
- uses: ./.github/actions/install/cmake
6262
with:
6363
version: "3.26.3"

‎.github/workflows/traits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- { name: "kazuho-picojson", tag: "111c9be5188f7350c2eac9ddaedd8cca3d7bf394", version: "111c9be" }
2020
- { name: "open-source-parsers-jsoncpp", tag: "1.9.5", version: "v1.9.5" }
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: lukka/get-cmake@latest
2424
- name: setup
2525
run: |

0 commit comments

Comments
 (0)