Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
a34d18f
:memo: add migration guide
nlohmann Aug 14, 2022
933a80e
Apply suggestions from code review
nlohmann Aug 17, 2022
8a59ae0
:ok_hand: address review comments
nlohmann Aug 20, 2022
2c90294
:loud_sound: add debug output
nlohmann Aug 20, 2022
90a81c7
:rewind: oops
nlohmann Aug 20, 2022
4c8cdd7
Add 'Check amalgamation' workflow (#3693)
falbrechtskirchinger Aug 27, 2022
f7973f4
Use official Clang/GCC containers (#3703)
nlohmann Aug 27, 2022
bed648c
Allow custom base class as node customization point (#3110)
barcode Aug 28, 2022
307c053
Add missing <numeric> include (#3719)
falbrechtskirchinger Aug 30, 2022
58bd97e
Add clang-tools to required tools for ci_static_analysis_clang (#3724)
nlohmann Sep 13, 2022
15ca78a
Add dark mode toggle to documentation (#3726)
falbrechtskirchinger Sep 15, 2022
c920f3f
Update Codacy link (#3740)
nlohmann Sep 16, 2022
9dfa722
Fix typos in .md files (#3748)
tocic Sep 17, 2022
2d1f9b6
Add Bazel build support (#3709)
Vertexwahn Sep 18, 2022
3d1252b
Replace limit macros with std::numeric_limits (#3723)
falbrechtskirchinger Sep 19, 2022
f4658de
Fix 'declaration hides global declaration' warning (#3751)
falbrechtskirchinger Sep 19, 2022
17d9eac
Add missing files to release artifacts (#3728)
falbrechtskirchinger Sep 25, 2022
4b2c8ce
Fix some typos for n-dimensional arrays (#3767)
striezel Sep 26, 2022
a3e6e26
Bump joblib from 1.1.0 to 1.2.0 in /docs/mkdocs (#3781)
dependabot[bot] Oct 2, 2022
e1cdbec
:memo: add migration guide
nlohmann Aug 14, 2022
865c36d
Apply suggestions from code review
nlohmann Aug 17, 2022
9f31c91
:ok_hand: address review comments
nlohmann Aug 20, 2022
be77d8c
:loud_sound: add debug output
nlohmann Aug 20, 2022
f1d65a3
:rewind: oops
nlohmann Aug 20, 2022
c6f8561
:ok_hand: apply suggestion
nlohmann Oct 2, 2022
c3c75e6
Merge remote-tracking branch 'origin/migration_guide' into migration_…
nlohmann Oct 2, 2022
24ba54e
Fix pipeline (#3862)
nlohmann Dec 4, 2022
d8e2680
:memo: add migration guide
nlohmann Aug 14, 2022
b73c342
Apply suggestions from code review
nlohmann Aug 17, 2022
5219a58
:ok_hand: address review comments
nlohmann Aug 20, 2022
96d024b
:loud_sound: add debug output
nlohmann Aug 20, 2022
c156278
:rewind: oops
nlohmann Aug 20, 2022
7836f57
:ok_hand: apply suggestion
nlohmann Oct 2, 2022
e15aad9
:memo: add migration guide
nlohmann Aug 14, 2022
1b779a7
Apply suggestions from code review
nlohmann Aug 17, 2022
52fd890
:memo: cleanup
nlohmann Dec 4, 2022
9a24def
:loud_sound: add debug output
nlohmann Aug 20, 2022
8343707
:rewind: oops
nlohmann Aug 20, 2022
2e14b20
Merge remote-tracking branch 'origin/migration_guide' into migration_…
nlohmann Dec 4, 2022
1bbbc96
:bug: fix natvis XML
nlohmann Dec 4, 2022
6289c5c
Fix natvis XML (#3863)
nlohmann Dec 9, 2022
918810a
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
c321134
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
21cc96a
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
559c0ff
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
682bdd9
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
3dfbbf5
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
6140ae1
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
293d2f0
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
9eca81f
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
3c50044
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
216cf06
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
e5dd786
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
82f24f4
:green_heart: fix Ubuntu build
nlohmann Dec 10, 2022
13f3f9a
:memo: add migration guide
nlohmann Aug 14, 2022
d418962
Apply suggestions from code review
nlohmann Aug 17, 2022
e94bdb0
:memo: add migration guide
nlohmann Aug 14, 2022
983588a
Apply suggestions from code review
nlohmann Aug 17, 2022
4db19ed
Bump certifi from 2022.6.15 to 2022.12.7 in /docs/mkdocs (#3872)
dependabot[bot] Dec 11, 2022
fbd7ca3
Add CIFuzz CI GitHub action (#3845)
DavidKorczynski Dec 11, 2022
ac6adbf
Clang 15 (#3876)
nlohmann Dec 11, 2022
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
Prev Previous commit
Next Next commit
Fix pipeline (#3862)
  • Loading branch information
nlohmann authored Dec 4, 2022
commit 24ba54e687a289d8f21de5ed1db2f261ec574e3e
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
23 changes: 18 additions & 5 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -65,15 +65,26 @@ 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
strategy:
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
Expand Down Expand Up @@ -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
Expand Down
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down