Skip to content

Commit ee04a2b

Browse files
Merge branch 'master' into master
2 parents 6e9a24f + 8ed685e commit ee04a2b

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
@@ -36,7 +36,7 @@ jobs:
3636
default-linux-with-examples:
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- uses: lukka/get-cmake@latest
4141

4242
- name: setup
@@ -55,7 +55,7 @@ jobs:
5555
default-win:
5656
runs-on: windows-latest
5757
steps:
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959
- uses: lukka/get-cmake@latest
6060
- run: choco install openssl
6161

@@ -75,7 +75,7 @@ jobs:
7575
min-req:
7676
runs-on: ubuntu-20.04
7777
steps:
78-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
7979
- uses: ./.github/actions/install/cmake
8080
with:
8181
version: "3.14.7"
@@ -98,7 +98,7 @@ jobs:
9898
custom-install-linux:
9999
runs-on: ubuntu-latest
100100
steps:
101-
- uses: actions/checkout@v3
101+
- uses: actions/checkout@v4
102102
- uses: lukka/get-cmake@latest
103103

104104
- name: setup
@@ -117,7 +117,7 @@ jobs:
117117
custom-install-win:
118118
runs-on: windows-latest
119119
steps:
120-
- uses: actions/checkout@v3
120+
- uses: actions/checkout@v4
121121
- uses: lukka/get-cmake@latest
122122
- run: choco install openssl
123123

@@ -137,7 +137,7 @@ jobs:
137137
no-pico:
138138
runs-on: ubuntu-latest
139139
steps:
140-
- uses: actions/checkout@v3
140+
- uses: actions/checkout@v4
141141
- uses: lukka/get-cmake@latest
142142

143143
- name: setup
@@ -156,7 +156,7 @@ jobs:
156156
no-base64:
157157
runs-on: ubuntu-latest
158158
steps:
159-
- uses: actions/checkout@v3
159+
- uses: actions/checkout@v4
160160
- uses: lukka/get-cmake@latest
161161

162162
- name: setup
@@ -175,7 +175,7 @@ jobs:
175175
with-libressl:
176176
runs-on: ubuntu-latest
177177
steps:
178-
- uses: actions/checkout@v3
178+
- uses: actions/checkout@v4
179179
- uses: lukka/get-cmake@latest
180180
- uses: ./.github/actions/install/libressl
181181

@@ -195,7 +195,7 @@ jobs:
195195
with-wolfssl:
196196
runs-on: ubuntu-latest
197197
steps:
198-
- uses: actions/checkout@v3
198+
- uses: actions/checkout@v4
199199
- uses: lukka/get-cmake@latest
200200
- uses: ./.github/actions/install/wolfssl
201201
with:
@@ -217,7 +217,7 @@ jobs:
217217
with-hunter:
218218
runs-on: ubuntu-latest
219219
steps:
220-
- uses: actions/checkout@v3
220+
- uses: actions/checkout@v4
221221
- uses: lukka/get-cmake@latest
222222

223223
- 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/[email protected]/lib/pkgconfig/*.pc /usr/local/lib/pkgconfig/
1818

19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- run: cmake -E make_directory ${{ github.workspace }}/build
2121

2222
- name: configure

.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
@@ -27,15 +27,16 @@ jobs:
2727
working-directory: build
2828
run: make jwt-cpp-test coverage
2929

30-
- uses: coverallsapp/github-action@1.1.3
30+
- uses: coverallsapp/github-action@v2
3131
with:
3232
github-token: ${{ secrets.GITHUB_TOKEN }}
33-
path-to-lcov: build/coverage.info
33+
file: build/coverage.info
34+
format: lcov
3435

3536
fuzzing:
3637
runs-on: ubuntu-latest
3738
steps:
38-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
3940
- uses: lukka/get-cmake@latest
4041
- uses: ./.github/actions/install/gtest
4142

@@ -62,7 +63,7 @@ jobs:
6263
- { tag: "openssl-3.0.5", name: "3.0.5" }
6364
- { tag: "OpenSSL_1_1_1q", name: "1.1.1q" }
6465
steps:
65-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6667
- uses: lukka/get-cmake@latest
6768
- uses: ./.github/actions/install/gtest
6869
- uses: ./.github/actions/install/openssl
@@ -91,7 +92,7 @@ jobs:
9192
ubsan:
9293
runs-on: ubuntu-20.04
9394
steps:
94-
- uses: actions/checkout@v3
95+
- uses: actions/checkout@v4
9596
- uses: lukka/get-cmake@latest
9697
- uses: ./.github/actions/install/gtest
9798

.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: |
5858
mkdir build
@@ -66,7 +66,7 @@ jobs:
6666
linter_name: clang-tidy
6767

6868
render-defaults:
69-
runs-on: ubuntu-20.04
69+
runs-on: ubuntu-22.04
7070
strategy:
7171
fail-fast: false
7272
matrix:
@@ -78,22 +78,24 @@ jobs:
7878
- { name: "open_source_parsers_jsoncpp", library: "jsoncpp", url: "https://github.com/open-source-parsers/jsoncpp", disable_pico: true }
7979
name: render-defaults (${{ matrix.traits.name }})
8080
steps:
81-
- uses: actions/checkout@v3
81+
- uses: actions/checkout@v4
82+
- run: |
83+
sudo apt-get install clang-format-14
8284
- uses: ./.github/actions/render/defaults
8385
id: render
8486
with:
8587
traits_name: ${{ matrix.traits.name }}
8688
library_name: ${{ matrix.traits.library }}
8789
library_url: ${{ matrix.traits.url }}
8890
disable_default_traits: ${{ matrix.traits.disable_pico }}
89-
- run: clang-format -i ${{ steps.render.outputs.file_path }}
91+
- run: clang-format-14 -i ${{ steps.render.outputs.file_path }}
9092
- run: git add ${{ steps.render.outputs.file_path }}
9193
- uses: ./.github/actions/process-linting-results
9294
with:
9395
linter_name: render-defaults
9496

9597
render-tests:
96-
runs-on: ubuntu-20.04
98+
runs-on: ubuntu-22.04
9799
strategy:
98100
fail-fast: false
99101
matrix:
@@ -105,13 +107,15 @@ jobs:
105107
- { name: "open_source_parsers_jsoncpp", suite: "OspJsoncppTest" }
106108
name: render-tests (${{ matrix.traits.name }})
107109
steps:
108-
- uses: actions/checkout@v3
109-
- run: shopt -s globstar
110+
- uses: actions/checkout@v4
111+
- run: |
112+
sudo apt-get install clang-format-14
113+
shopt -s globstar
110114
- uses: ./.github/actions/render/tests
111115
with:
112116
traits_name: ${{ matrix.traits.name }}
113117
test_suite_name: ${{ matrix.traits.suite }}
114-
- run: clang-format -i tests/**/*.cpp
118+
- run: clang-format-14 -i tests/**/*.cpp
115119
- run: git add tests/traits/*
116120
- uses: ./.github/actions/process-linting-results
117121
with:
@@ -120,7 +124,7 @@ jobs:
120124
line-ending:
121125
runs-on: ubuntu-20.04
122126
steps:
123-
- uses: actions/checkout@v3
127+
- uses: actions/checkout@v4
124128
- run: git add --renormalize .
125129
- uses: ./.github/actions/process-linting-results
126130
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"
@@ -55,7 +55,7 @@ jobs:
5555
- run: |
5656
apt-get update
5757
apt-get install -y g++-12 wget make libssl-dev
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959
- uses: ./.github/actions/install/cmake
6060
with:
6161
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)