Skip to content

Commit 3301293

Browse files
committed
Cleanup
1 parent 072fb58 commit 3301293

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

.clang-format

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
# the official .clang-format style for https://github.com/taocpp
1+
# The Art of C++
2+
# https://github.com/taocpp
3+
4+
# Copyright (c) 2016-2023 Dr. Colin Hirsch and Daniel Frey
5+
# Distributed under the Boost Software License, Version 1.0.
6+
# (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
7+
8+
# This is our official .clang-format style for https://github.com/taocpp
29
#
310
# clang-format -i -style=file $(find . -name '[^.]*.[hc]pp')
411

.clang-tidy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The Art of C++
2-
# https://github.com/taocpp/json
2+
# https://github.com/taocpp
33

4-
# Copyright (c) 2016-2023 Daniel Frey
4+
# Copyright (c) 2016-2023 Dr. Colin Hirsch and Daniel Frey
55
# Distributed under the Boost Software License, Version 1.0.
66
# (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
77

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
with:
7171
submodules: recursive
7272

73-
- run: sudo apt-get update
73+
- run: sudo apt-get update -y
7474

7575
- run: sudo apt-get install -y ${{ matrix.compiler }}
7676

.github/workflows/macos.yml

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,32 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
xcode: ['13', '14']
19-
build_type: [Debug, Release]
20-
21-
runs-on: macos-latest
22-
23-
steps:
24-
- uses: actions/checkout@v3
25-
with:
26-
submodules: recursive
27-
28-
- uses: maxim-lobanov/setup-xcode@v1
29-
with:
30-
xcode-version: ${{ matrix.xcode }}
31-
32-
- run: cmake -E make_directory build
33-
34-
- working-directory: build/
35-
run: cmake $GITHUB_WORKSPACE
36-
37-
- working-directory: build/
38-
run: cmake --build . --config ${{ matrix.build_type }}
39-
40-
- working-directory: build/
41-
run: ctest --config ${{ matrix.build_type }} --output-on-failure
42-
43-
xcode-old:
44-
strategy:
45-
fail-fast: false
46-
matrix:
47-
xcode: ['11', '12']
48-
build_type: [Debug, Release]
49-
50-
runs-on: macos-11
18+
include:
19+
- xcode: 11
20+
build_type: Debug
21+
os: macos-11
22+
- xcode: 11
23+
build_type: Release
24+
os: macos-11
25+
- xcode: 12
26+
build_type: Debug
27+
os: macos-11
28+
- xcode: 12
29+
build_type: Release
30+
os: macos-11
31+
- xcode: 13
32+
build_type: Debug
33+
os: macos-12
34+
- xcode: 13
35+
build_type: Release
36+
os: macos-12
37+
- xcode: 14
38+
build_type: Debug
39+
os: macos-12
40+
- xcode: 14
41+
build_type: Release
42+
os: macos-12
43+
runs-on: ${{ matrix.os }}
5144

5245
steps:
5346
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)