diff --git a/.clang-format b/.clang-format index c423ca27..a111c83a 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,11 @@ -# the official .clang-format style for https://github.com/taocpp +# The Art of C++ +# https://github.com/taocpp + +# Copyright (c) 2016-2023 Dr. Colin Hirsch and Daniel Frey +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) + +# This is our official .clang-format style for https://github.com/taocpp # # clang-format -i -style=file $(find . -name '[^.]*.[hc]pp') diff --git a/.clang-tidy b/.clang-tidy index 8b5f4236..66c04fee 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,7 +1,7 @@ # The Art of C++ -# https://github.com/taocpp/json +# https://github.com/taocpp -# Copyright (c) 2016-2023 Daniel Frey +# Copyright (c) 2016-2023 Dr. Colin Hirsch and Daniel Frey # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a519ee01..28debd5d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -70,7 +70,7 @@ jobs: with: submodules: recursive - - run: sudo apt-get update + - run: sudo apt-get update -y - run: sudo apt-get install -y ${{ matrix.compiler }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c523b22a..f9b728b8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,39 +15,32 @@ jobs: strategy: fail-fast: false matrix: - xcode: ['13', '14'] - build_type: [Debug, Release] - - runs-on: macos-latest - - steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: ${{ matrix.xcode }} - - - run: cmake -E make_directory build - - - working-directory: build/ - run: cmake $GITHUB_WORKSPACE - - - working-directory: build/ - run: cmake --build . --config ${{ matrix.build_type }} - - - working-directory: build/ - run: ctest --config ${{ matrix.build_type }} --output-on-failure - - xcode-old: - strategy: - fail-fast: false - matrix: - xcode: ['11', '12'] - build_type: [Debug, Release] - - runs-on: macos-11 + include: + - xcode: 11 + build_type: Debug + os: macos-11 + - xcode: 11 + build_type: Release + os: macos-11 + - xcode: 12 + build_type: Debug + os: macos-11 + - xcode: 12 + build_type: Release + os: macos-11 + - xcode: 13 + build_type: Debug + os: macos-12 + - xcode: 13 + build_type: Release + os: macos-12 + - xcode: 14 + build_type: Debug + os: macos-12 + - xcode: 14 + build_type: Release + os: macos-12 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3