Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
3f33c217
Unverified
Commit
3f33c217
authored
Mar 29, 2021
by
Niels Lohmann
Committed by
GitHub
Mar 29, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2689 from nlohmann/ci_matrix
add more CI steps
parents
f2680359
d927f445
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
23 deletions
+38
-23
.github/workflows/macos.yml
.github/workflows/macos.yml
+6
-1
.github/workflows/ubuntu.yml
.github/workflows/ubuntu.yml
+22
-17
.github/workflows/windows.yml
.github/workflows/windows.yml
+6
-1
cmake/ci.cmake
cmake/ci.cmake
+4
-4
No files found.
.github/workflows/macos.yml
View file @
3f33c217
name
:
macOS
on
:
[
push
,
pull_request
]
on
:
push
:
branches
:
-
develop
-
master
pull_request
:
jobs
:
xcode
:
...
...
.github/workflows/ubuntu.yml
View file @
3f33c217
name
:
Ubuntu
on
:
[
push
,
pull_request
]
on
:
push
:
branches
:
-
develop
-
master
pull_request
:
jobs
:
ci_test_clang_cxx20
:
runs-on
:
ubuntu-latest
steps
:
-
uses
:
actions/checkout@v2
-
name
:
install_clang
run
:
|
sudo apt update
sudo apt install clang-10 ninja-build
shell
:
bash
-
name
:
cmake
run
:
cmake -S . -B build -DJSON_CI=On
-
name
:
build
run
:
cmake --build build --target ci_test_clang_cxx20
ci_test_clang
:
runs-on
:
ubuntu-latest
steps
:
...
...
@@ -53,7 +44,7 @@ jobs:
container
:
nlohmann/json-ci:latest
strategy
:
matrix
:
target
:
[
ci_clang_tidy
,
ci_cppcheck
,
ci_test_valgrind
,
ci_test_clang_sanitizer
,
ci_test_amalgamation
,
ci_clang_analyze
,
ci_cpplint
]
target
:
[
ci_clang_tidy
,
ci_cppcheck
,
ci_test_valgrind
,
ci_test_clang_sanitizer
,
ci_test_amalgamation
,
ci_clang_analyze
,
ci_cpplint
,
ci_cmake_flags
,
ci_single_binaries
,
ci_reproducible_tests
,
ci_non_git_tests
,
ci_offline_testdata
]
steps
:
-
uses
:
actions/checkout@v2
-
name
:
cmake
...
...
@@ -105,4 +96,18 @@ jobs:
-
name
:
cmake
run
:
cmake -S . -B build -DJSON_CI=On
-
name
:
build
run
:
cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
\ No newline at end of file
run
:
cmake --build build --target ci_test_compiler_${{ matrix.compiler }}
ci_test_standards
:
runs-on
:
ubuntu-latest
container
:
nlohmann/json-ci:latest
strategy
:
matrix
:
standard
:
[
11
,
14
,
17
,
20
]
compiler
:
[
gcc
,
clang
]
steps
:
-
uses
:
actions/checkout@v2
-
name
:
cmake
run
:
cmake -S . -B build -DJSON_CI=On
-
name
:
build
run
:
cmake --build build --target ci_test_${{ matrix.compiler }}_cxx${{ matrix.standard }}
.github/workflows/windows.yml
View file @
3f33c217
name
:
Windows
on
:
[
push
,
pull_request
]
on
:
push
:
branches
:
-
develop
-
master
pull_request
:
jobs
:
mingw
:
...
...
cmake/ci.cmake
View file @
3f33c217
...
...
@@ -401,7 +401,7 @@ foreach(CXX_STANDARD 11 14 17 20)
COMMAND CXX=
${
GCC_TOOL
}
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Debug -GNinja
-DCMAKE_CXX_STANDARD=
${
CXX_STANDARD
}
-DCMAKE_CXX_STANDARD_REQUIRED=ON
-DJSON_BuildTests=ON
-DJSON_BuildTests=ON
-DJSON_FastTests=ON
-S
${
PROJECT_SOURCE_DIR
}
-B
${
PROJECT_BINARY_DIR
}
/build_gcc_cxx
${
CXX_STANDARD
}
COMMAND
${
CMAKE_COMMAND
}
--build
${
PROJECT_BINARY_DIR
}
/build_gcc_cxx
${
CXX_STANDARD
}
COMMAND cd
${
PROJECT_BINARY_DIR
}
/build_gcc_cxx
${
CXX_STANDARD
}
&&
${
CMAKE_CTEST_COMMAND
}
--parallel
${
N
}
--output-on-failure
...
...
@@ -650,7 +650,7 @@ add_custom_target(ci_offline_testdata
COMMAND cd
${
PROJECT_BINARY_DIR
}
/build_offline_testdata/test_data &&
${
GIT_TOOL
}
clone -c advice.detachedHead=false --branch v3.0.0 https://github.com/nlohmann/json_test_data.git --quiet --depth 1
COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Debug -GNinja
-DJSON_BuildTests=ON -DJSON_TestDataDirectory=
${
PROJECT_BINARY_DIR
}
/build_offline_testdata/test_data/json_test_data
-DJSON_BuildTests=ON -DJSON_
FastTests=ON -DJSON_
TestDataDirectory=
${
PROJECT_BINARY_DIR
}
/build_offline_testdata/test_data/json_test_data
-S
${
PROJECT_SOURCE_DIR
}
-B
${
PROJECT_BINARY_DIR
}
/build_offline_testdata
COMMAND
${
CMAKE_COMMAND
}
--build
${
PROJECT_BINARY_DIR
}
/build_offline_testdata
COMMAND cd
${
PROJECT_BINARY_DIR
}
/build_offline_testdata &&
${
CMAKE_CTEST_COMMAND
}
--parallel
${
N
}
--output-on-failure
...
...
@@ -666,7 +666,7 @@ add_custom_target(ci_non_git_tests
COMMAND cd
${
PROJECT_SOURCE_DIR
}
&& for FILE in `
${
GIT_TOOL
}
ls-tree --name-only HEAD`\; do cp -r $$FILE
${
PROJECT_BINARY_DIR
}
/build_non_git_tests/sources \; done
COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Debug -GNinja
-DJSON_BuildTests=ON
-DJSON_BuildTests=ON
-DJSON_FastTests=ON
-S
${
PROJECT_BINARY_DIR
}
/build_non_git_tests/sources -B
${
PROJECT_BINARY_DIR
}
/build_non_git_tests
COMMAND
${
CMAKE_COMMAND
}
--build
${
PROJECT_BINARY_DIR
}
/build_non_git_tests
COMMAND cd
${
PROJECT_BINARY_DIR
}
/build_non_git_tests &&
${
CMAKE_CTEST_COMMAND
}
--parallel
${
N
}
-LE git_required --output-on-failure
...
...
@@ -680,7 +680,7 @@ add_custom_target(ci_non_git_tests
add_custom_target
(
ci_reproducible_tests
COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_BUILD_TYPE=Debug -GNinja
-DJSON_BuildTests=ON
-DJSON_BuildTests=ON
-DJSON_FastTests=ON
-S
${
PROJECT_SOURCE_DIR
}
-B
${
PROJECT_BINARY_DIR
}
/build_reproducible_tests
COMMAND
${
CMAKE_COMMAND
}
--build
${
PROJECT_BINARY_DIR
}
/build_reproducible_tests
COMMAND cd
${
PROJECT_BINARY_DIR
}
/build_reproducible_tests &&
${
CMAKE_CTEST_COMMAND
}
--parallel
${
N
}
-LE not_reproducible --output-on-failure
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment