Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI targets #2561

Merged
merged 126 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
8d8c9b9
:alembic: move CI targets to CMake
nlohmann Dec 26, 2020
b1afe8d
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Dec 26, 2020
5276ab9
:recycle: add target for cpplint
nlohmann Dec 26, 2020
d9941bd
:recycle: add target for self-contained binaries
nlohmann Dec 26, 2020
3676053
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Dec 26, 2020
6f7ffa5
:recycle: add targets for iwyu and infer
nlohmann Dec 26, 2020
4c6cda3
:loud_sound: add version output
nlohmann Dec 27, 2020
9427318
:recycle: add target for oclint
nlohmann Dec 27, 2020
35b5de2
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Dec 30, 2020
77f2450
:rotating_light: fix warnings
nlohmann Dec 30, 2020
0bee420
:recycle: rename targets
nlohmann Dec 30, 2020
45ec48b
:recycle: use iwyu properly
nlohmann Dec 30, 2020
f5856be
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Dec 31, 2020
7cb49fa
:rotating_light: fix warnings
nlohmann Jan 1, 2021
6085bee
:rotating_light: fix warnings
nlohmann Jan 1, 2021
6bfcea3
:rotating_light: fix warnings
nlohmann Jan 1, 2021
8dc3ed1
:rotating_light: fix warnings
nlohmann Jan 1, 2021
a6b82cd
:recycle: use iwyu properly
nlohmann Jan 1, 2021
1a7d208
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Jan 3, 2021
93fad23
:recycle: add target for benchmarks
nlohmann Jan 3, 2021
dc0a921
:recycle: add target for CMake flags
nlohmann Jan 3, 2021
b36f40b
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Jan 3, 2021
7d5881a
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Jan 16, 2021
4a56f12
:construction_worker: use GitHub Actions
nlohmann Jan 17, 2021
bd85996
:construction_worker: use GitHub Actions
nlohmann Jan 17, 2021
755f694
:alembic: try to install Clang 11
nlohmann Jan 17, 2021
ce9f6a1
:alembic: try to install GCC 11
nlohmann Jan 17, 2021
bac9844
:alembic: try to install Clang 11
nlohmann Jan 17, 2021
a749b1c
:alembic: try to install GCC 11
nlohmann Jan 17, 2021
b7befb2
:alembic: add clang analyze target
nlohmann Jan 17, 2021
06bffd2
:alembic: add clang analyze target
nlohmann Jan 17, 2021
08d51c0
:alembic: add clang analyze target
nlohmann Jan 17, 2021
d2ef9a4
:fire: remove Google Benchmark
nlohmann Jan 23, 2021
c092de1
:arrow_up: Google Benchmark 1.5.2
nlohmann Jan 23, 2021
d7d34df
:fire: use fetchcontent
nlohmann Jan 23, 2021
05e2cd4
:penguin: add target to download a Linux version of CMake
nlohmann Jan 23, 2021
395788c
:hammer: fix dependency
nlohmann Jan 23, 2021
96a1334
:rotating_light: fix includes
nlohmann Jan 23, 2021
9dd1d50
:rotating_light: fix comment
nlohmann Jan 23, 2021
2efc295
:wrench: adjust flags for GCC 11.0.0 20210110 (experimental)
nlohmann Jan 23, 2021
5791901
:whale: user Docker image to run CI
nlohmann Jan 24, 2021
40a6532
:wrench: add target for Valgrind
nlohmann Jan 25, 2021
f3a68ae
:construction_worker: add target for Valgrind tests
nlohmann Jan 25, 2021
f4ea5bc
:alembic: add Dart
nlohmann Jan 25, 2021
46a243b
:rewind: remove Dart
nlohmann Jan 26, 2021
eadcce9
:alembic: do not call ctest in test subdirectory
nlohmann Jan 26, 2021
8651ad4
:alembic: download test data explicitly
nlohmann Jan 26, 2021
468dc58
:alembic: only execute Valgrind tests
nlohmann Jan 26, 2021
b2bc283
:alembic: fix labels
nlohmann Jan 26, 2021
5397603
:fire: remove unneeded jobs
nlohmann Jan 26, 2021
d9bde8e
:hammer: cleanup
nlohmann Jan 26, 2021
702d223
:bug: fix OCLint call
nlohmann Jan 26, 2021
309829d
:white_check_mark: add targets for offline and git-independent tests
nlohmann Jan 27, 2021
24cab96
:white_check_mark: add targets for C++ language versions and reproduc…
nlohmann Jan 27, 2021
e71daa1
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Jan 27, 2021
2e044e2
:hammer: clean up
nlohmann Jan 27, 2021
0a27d1c
:construction_worker: add CI steps for cppcheck and cpplint
nlohmann Jan 27, 2021
cb28e76
:rotating_light: fix warnings from Clang-Tidy
nlohmann Jan 27, 2021
87d1dc7
:construction_worker: add CI steps for Clang-Tidy
nlohmann Jan 27, 2021
81c8ded
:construction_worker: add CI steps for Clang-Tidy
nlohmann Jan 27, 2021
10fc352
:rotating_light: fix warnings
nlohmann Jan 27, 2021
c243cd7
:rotating_light: fix warnings
nlohmann Jan 28, 2021
ea69fe0
:wrench: select proper binary
nlohmann Jan 28, 2021
eba434a
:rotating_light: fix warnings
nlohmann Jan 28, 2021
2d175d9
:rotating_light: fix warnings
nlohmann Jan 28, 2021
866a4c5
:rotating_light: suppress some unhelpful warnings
nlohmann Jan 28, 2021
675f07f
:rotating_light: fix warnings
nlohmann Jan 28, 2021
28d5f86
:rotating_light: fix warnings
nlohmann Jan 28, 2021
ae78c96
:art: fix format
nlohmann Jan 28, 2021
4ade721
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Jan 28, 2021
cdd6412
:rotating_light: fix warnings
nlohmann Jan 28, 2021
09bf771
:rotating_light: fix warnings
nlohmann Jan 28, 2021
bfcbb43
:rotating_light: fix warnings
nlohmann Jan 28, 2021
bdcabc0
:rotating_light: fix warnings
nlohmann Jan 28, 2021
0dcb01b
:rotating_light: fix warnings
nlohmann Jan 28, 2021
bfd4c7c
:rotating_light: fix warnings
nlohmann Jan 28, 2021
95f50a3
:rotating_light: fix warnings
nlohmann Jan 28, 2021
e2868ee
:rotating_light: fix warnings
nlohmann Jan 28, 2021
b5c5eaa
:rotating_light: fix warnings
nlohmann Jan 28, 2021
de9ae4e
:rotating_light: fix warnings
nlohmann Jan 28, 2021
c3edf49
:rotating_light: fix warnings
nlohmann Jan 28, 2021
8b362b5
:construction_worker: add CI steps for Sanitizers
nlohmann Jan 28, 2021
3393ce0
:rotating_light: fix warnings
nlohmann Jan 28, 2021
8073441
:rotating_light: fix warnings
nlohmann Jan 28, 2021
eacf4f4
:zap: add optimization to sanitizer build
nlohmann Jan 28, 2021
1101f0e
:rotating_light: fix warnings
nlohmann Jan 29, 2021
baaa706
:rotating_light: add missing header
nlohmann Jan 29, 2021
52aa607
:rotating_light: fix warnings
nlohmann Jan 29, 2021
37b8071
:rotating_light: fix warnings
nlohmann Jan 29, 2021
0b7af87
:rotating_light: fix warnings
nlohmann Jan 29, 2021
2465302
:rotating_light: fix warnings
nlohmann Jan 29, 2021
7b3ba24
:rotating_light: fix warnings
nlohmann Jan 29, 2021
b66ebcc
:rotating_light: fix warnings
nlohmann Jan 30, 2021
4ba6070
:rotating_light: fix warnings
nlohmann Jan 30, 2021
9b1d469
:construction_worker: add CI step for coverage
nlohmann Jan 30, 2021
6413f31
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
143cc06
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
0f43ba9
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
6738fbd
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
9ced2bf
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
21a193c
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
053ed6c
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
829f119
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
91475ee
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
d6f54a0
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
5573533
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
799472a
:construction_worker: add CI step for coverage
nlohmann Jan 31, 2021
8d99352
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Feb 7, 2021
c9e66df
:construction_worker: add CI steps for disabled exceptions and implic…
nlohmann Feb 8, 2021
fd37fc5
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Feb 8, 2021
29b27e3
:rotating_light: fix warnings
nlohmann Feb 8, 2021
d68b7f7
:construction_worker: add CI steps for checking indentation
nlohmann Feb 9, 2021
efc1116
:bug: fix variable use
nlohmann Feb 9, 2021
2b0d696
:twisted_rightwards_arrows: merge develop
nlohmann Feb 10, 2021
bea760c
:green_heart: fix build
nlohmann Feb 10, 2021
378622c
:heavy_minus_sign: remove CircleCI
nlohmann Feb 10, 2021
9882e4a
:construction_worker: add CI step for diagnostics
nlohmann Feb 10, 2021
3d1048e
Merge branch 'develop' of https://github.com/nlohmann/json into ci
nlohmann Mar 23, 2021
1e08af8
:rotating_light: fix warning
nlohmann Mar 23, 2021
fc38454
:rotating_light: fix warning
nlohmann Mar 23, 2021
5306eef
:rotating_light: fix warning
nlohmann Mar 23, 2021
4428121
:rotating_light: fix warning
nlohmann Mar 23, 2021
bc23505
:rotating_light: fix warning
nlohmann Mar 23, 2021
63c52b1
:rotating_light: fix warning
nlohmann Mar 23, 2021
f7ada0a
:rotating_light: fix warning
nlohmann Mar 23, 2021
3d0812a
:fire: clean Travis
nlohmann Mar 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions .circleci/config.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,23 +1,44 @@
Checks: '*,
-android-cloexec-fopen,
-cppcoreguidelines-avoid-goto,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-avoid-non-const-global-variables,
-cppcoreguidelines-macro-usage,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-cppcoreguidelines-pro-bounds-constant-array-index,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-type-reinterpret-cast,
-cppcoreguidelines-pro-type-union-access,
-fuchsia-default-arguments-calls,
-fuchsia-default-arguments-declarations,
-fuchsia-overloaded-operator,
-google-explicit-constructor,
-google-readability-function-size,
-google-runtime-int,
-google-runtime-references,
-hicpp-avoid-goto,
-hicpp-explicit-conversions,
-hicpp-function-size,
-hicpp-no-array-decay,
-hicpp-no-assembler,
-hicpp-signed-bitwise,
-hicpp-uppercase-literal-suffix,
-llvm-header-guard,
-llvm-include-order,
-llvmlibc-*,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
-modernize-use-trailing-return-type,
-readability-function-size,
-readability-magic-numbers,
-readability-redundant-access-specifiers,
-readability-uppercase-literal-suffix'

CheckOptions:
- key: hicpp-special-member-functions.AllowSoleDefaultDtor
value: 1

WarningsAsErrors: '*'

#HeaderFilterRegex: '.*nlohmann.*'
HeaderFilterRegex: '.*hpp$'
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
- name: build
Expand Down
205 changes: 160 additions & 45 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,177 @@ name: Ubuntu
on: [push, pull_request]

jobs:
gcc_build:
ci_test_clang_cxx20:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: install_gcc
- uses: actions/checkout@v2
- name: install_clang
run: |
sudo apt update
sudo apt install gcc-10 g++-10
sudo apt update
sudo apt install clang-10 ninja-build
shell: bash
- name: cmake
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
env:
CC: gcc-10
CXX: g++-10
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --parallel 10
- name: test
run: cd build ; ctest -j 10 --output-on-failure
run: cmake --build build --target ci_test_clang_cxx20

clang_build:
ci_clang_analyze:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: install_ninja
run: |
sudo apt update
sudo apt install ninja-build
shell: bash
- name: install_clang
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 11
sudo apt-get install clang-tools-11
shell: bash
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_clang_analyze

ci_test_clang:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: install_gcc
run: |
sudo apt update
sudo apt install clang-10
shell: bash
- name: cmake
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
env:
CC: clang-10
CXX: clang++-10
- name: build
run: cmake --build build --parallel 10
- name: test
run: cd build ; ctest -j 10 --output-on-failure
- uses: actions/checkout@v2
- name: install_ninja
run: |
sudo apt update
sudo apt install ninja-build
shell: bash
- name: install_clang
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 11
sudo apt-get install clang-tools-11
shell: bash
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_clang

clang_build_cxx20:
ci_test_gcc:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_gcc

ci_test_valgrind:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v1
- name: install_gcc
run: |
sudo apt update
sudo apt install clang-10
shell: bash
- name: cmake
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON
env:
CC: clang-10
CXX: clang++-10
- name: build
run: cmake --build build --parallel 10
- name: test
run: cd build ; ctest -j 10 --output-on-failure
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_valgrind

ci_cppcheck:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_cppcheck

ci_cpplint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_cpplint

ci_clang_tidy:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_clang_tidy

ci_test_amalgamation:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_amalgamation

ci_test_diagnostics:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_diagnostics

ci_test_noexceptions:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_noexceptions

ci_test_noimplicitconversions:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_noimplicitconversions

ci_test_clang_sanitizer:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_clang_sanitizer

ci_test_coverage:
runs-on: ubuntu-latest
container: nlohmann/json-ci:latest
steps:
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -DJSON_CI=On
- name: build
run: cmake --build build --target ci_test_coverage
- name: archive coverage report
uses: actions/upload-artifact@v2
with:
name: code-coverage-report
path: /__w/json/json/build/html
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: /__w/json/json/build/json.info.filtered.noexcept
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
- name: build
Expand All @@ -19,7 +19,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: install Clang
run: curl -fsSL -o LLVM10.exe https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe ; 7z x LLVM10.exe -y -o"C:/Program Files/LLVM"
- name: cmake
Expand All @@ -33,7 +33,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -G "Visual Studio 16 2019" -A x64 -T ClangCL -DJSON_BuildTests=On
- name: build
Expand All @@ -45,7 +45,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: cmake
run: cmake -S . -B build -G "Visual Studio 16 2019" -A Win32 -T ClangCL -DJSON_BuildTests=On
- name: build
Expand Down
Loading