diff --git a/.clang-tidy b/.clang-tidy index 0739c7b33..ff84c58a0 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -7,6 +7,7 @@ Checks: '*, -cert-err58-cpp, -concurrency-mt-unsafe, -cppcoreguidelines-avoid-const-or-ref-data-members, + -cppcoreguidelines-avoid-do-while, -cppcoreguidelines-avoid-goto, -cppcoreguidelines-avoid-magic-numbers, -cppcoreguidelines-avoid-non-const-global-variables, diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7eaedd73c..ed867f45f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,7 +35,7 @@ jobs: runs-on: macos-12 strategy: matrix: - xcode: ['13.1', '13.2.1', '13.3.1', '13.4.1'] + xcode: ['13.1', '13.2.1', '13.3.1', '13.4.1', '14.0', '14.0.1', '14.1'] env: DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer @@ -53,8 +53,6 @@ jobs: strategy: matrix: standard: [11, 14, 17, 20] - env: - DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 47bd3371d..b444f5123 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest container: silkeh/clang:dev steps: - - name: Install git - run: apt-get update ; apt-get install -y git + - name: Install git and unzip + run: apt-get update ; apt-get install -y git unzip - uses: actions/checkout@v3 - name: Get latest CMake and ninja uses: lukka/get-cmake@latest @@ -55,7 +55,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [ci_cpplint, ci_cmake_flags, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata] + target: [ci_cpplint, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata] steps: - uses: actions/checkout@v3 - name: Get latest CMake and ninja @@ -65,6 +65,17 @@ jobs: - name: Build run: cmake --build build --target ${{ matrix.target }} + ci_cmake_flags: + runs-on: ubuntu-focal + steps: + - uses: actions/checkout@v3 + - name: Get latest CMake and ninja + uses: lukka/get-cmake@latest + - name: Run CMake + run: cmake -S . -B build -DJSON_CI=On + - name: Build + run: cmake --build build --target ci_cmake_flags + ci_static_analysis_clang: runs-on: ubuntu-latest container: silkeh/clang:dev @@ -72,8 +83,8 @@ jobs: matrix: target: [ci_clang_tidy, ci_test_clang_sanitizer, ci_clang_analyze] steps: - - name: Install git - run: apt-get update ; apt-get install -y git clang-tools + - name: Install git, clang-tools, and unzip + run: apt-get update ; apt-get install -y git clang-tools unzip - uses: actions/checkout@v3 - name: Get latest CMake and ninja uses: lukka/get-cmake@latest @@ -138,6 +149,8 @@ jobs: compiler: ['3.5', '3.6', '3.7', '3.8', '3.9', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', 'latest'] container: silkeh/clang:${{ matrix.compiler }} steps: + - name: Install unzip + run: apt-get update ; apt-get install -y unzip - uses: actions/checkout@v3 - name: Get latest CMake and ninja uses: lukka/get-cmake@latest diff --git a/README.md b/README.md index ddb3308d1..04edd85a9 100644 --- a/README.md +++ b/README.md @@ -1144,14 +1144,17 @@ The following compilers are currently used in continuous integration at [AppVeyo | Compiler | Operating System | CI Provider | |--------------------------------------------------------------------------------------------------------|--------------------|----------------| -| Apple Clang 11.0.3 (clang-1103.0.32.62); Xcode 11.7 | macOS 11.6.8 | GitHub Actions | -| Apple Clang 12.0.0 (clang-1200.0.32.29); Xcode 12.4 | macOS 11.6.8 | GitHub Actions | -| Apple Clang 12.0.5 (clang-1205.0.22.11); Xcode 12.5.1 | macOS 11.6.8 | GitHub Actions | -| Apple Clang 13.0.0 (clang-1300.0.29.3); Xcode 13.0 | macOS 11.6.8 | GitHub Actions | -| Apple Clang 13.0.0 (clang-1300.0.29.3); Xcode 13.1 | macOS 12.4 | GitHub Actions | -| Apple Clang 13.0.0 (clang-1300.0.29.30); Xcode 13.2.1 | macOS 12.4 | GitHub Actions | -| Apple Clang 13.1.6 (clang-1316.0.21.2.3); Xcode 13.3.1 | macOS 12.4 | GitHub Actions | -| Apple Clang 13.1.6 (clang-1316.0.21.2.5); Xcode 13.4.1 | macOS 12.4 | GitHub Actions | +| Apple Clang 11.0.3 (clang-1103.0.32.62); Xcode 11.7 | macOS 11.7.1 | GitHub Actions | +| Apple Clang 12.0.0 (clang-1200.0.32.29); Xcode 12.4 | macOS 11.7.1 | GitHub Actions | +| Apple Clang 12.0.5 (clang-1205.0.22.11); Xcode 12.5.1 | macOS 11.7.1 | GitHub Actions | +| Apple Clang 13.0.0 (clang-1300.0.29.3); Xcode 13.0 | macOS 11.7.1 | GitHub Actions | +| Apple Clang 13.0.0 (clang-1300.0.29.3); Xcode 13.1 | macOS 12.6.1 | GitHub Actions | +| Apple Clang 13.0.0 (clang-1300.0.29.30); Xcode 13.2.1 | macOS 12.6.1 | GitHub Actions | +| Apple Clang 13.1.6 (clang-1316.0.21.2.3); Xcode 13.3.1 | macOS 12.6.1 | GitHub Actions | +| Apple Clang 13.1.6 (clang-1316.0.21.2.5); Xcode 13.4.1 | macOS 12.6.1 | GitHub Actions | +| Apple Clang 14.0.0 (clang-1400.0.29.102); Xcode 14.0 | macOS 12.6.1 | GitHub Actions | +| Apple Clang 14.0.0 (clang-1400.0.29.102); Xcode 14.0.1 | macOS 12.6.1 | GitHub Actions | +| Apple Clang 14.0.0 (clang-1400.0.29.202); Xcode 14.1 | macOS 12.6.1 | GitHub Actions | | Clang 3.5.2 | Ubuntu 20.04.3 LTS | GitHub Actions | | Clang 3.6.2 | Ubuntu 20.04.3 LTS | GitHub Actions | | Clang 3.7.1 | Ubuntu 20.04.3 LTS | GitHub Actions |