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
325e8ab8
Unverified
Commit
325e8ab8
authored
May 27, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔧
explicitly switch on tests in CI
parent
ed5c28d0
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
18 deletions
+9
-18
.circleci/config.yml
.circleci/config.yml
+2
-8
.github/workflows/macos.yml
.github/workflows/macos.yml
+1
-1
.github/workflows/ubuntu.yml
.github/workflows/ubuntu.yml
+1
-1
.github/workflows/windows.yml
.github/workflows/windows.yml
+1
-1
.travis.yml
.travis.yml
+1
-5
README.md
README.md
+1
-1
appveyor.yml
appveyor.yml
+1
-1
test/CMakeLists.txt
test/CMakeLists.txt
+1
-0
No files found.
.circleci/config.yml
View file @
325e8ab8
...
@@ -10,12 +10,9 @@ jobs:
...
@@ -10,12 +10,9 @@ jobs:
-
run
:
-
run
:
name
:
Install required tools
name
:
Install required tools
command
:
'
apt-get
update
&&
apt-get
install
-y
gcc
g++
git
cmake'
command
:
'
apt-get
update
&&
apt-get
install
-y
gcc
g++
git
cmake'
-
run
:
name
:
Show versions
command
:
'
g++
--version
;
uname
-a;
cmake
--version'
-
run
:
-
run
:
name
:
Run CMake
name
:
Run CMake
command
:
'
mkdir
build
;
cd
build
;
cmake
..'
command
:
'
mkdir
build
;
cd
build
;
cmake
..
-DJSON_BuildTests=On
'
-
run
:
-
run
:
name
:
Compile
name
:
Compile
command
:
'
cmake
--build
build'
command
:
'
cmake
--build
build'
...
@@ -33,12 +30,9 @@ jobs:
...
@@ -33,12 +30,9 @@ jobs:
-
run
:
-
run
:
name
:
Install required tools
name
:
Install required tools
command
:
'
pacman
-Sy
--noconfirm
base
base-devel
gcc
git
cmake'
command
:
'
pacman
-Sy
--noconfirm
base
base-devel
gcc
git
cmake'
-
run
:
name
:
Show versions
command
:
'
g++
--version
;
uname
-a;
cmake
--version'
-
run
:
-
run
:
name
:
Run CMake
name
:
Run CMake
command
:
'
mkdir
build
;
cd
build
;
cmake
..'
command
:
'
mkdir
build
;
cd
build
;
cmake
..
-DJSON_BuildTests=On
'
-
run
:
-
run
:
name
:
Compile
name
:
Compile
command
:
'
cmake
--build
build'
command
:
'
cmake
--build
build'
...
...
.github/workflows/macos.yml
View file @
325e8ab8
...
@@ -10,7 +10,7 @@ jobs:
...
@@ -10,7 +10,7 @@ jobs:
steps
:
steps
:
-
uses
:
actions/checkout@v1
-
uses
:
actions/checkout@v1
-
name
:
cmake
-
name
:
cmake
run
:
cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug
run
:
cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug
-DJSON_BuildTests=On
-
name
:
build
-
name
:
build
run
:
cmake --build build --parallel
10
run
:
cmake --build build --parallel
10
-
name
:
test
-
name
:
test
...
...
.github/workflows/ubuntu.yml
View file @
325e8ab8
...
@@ -10,7 +10,7 @@ jobs:
...
@@ -10,7 +10,7 @@ jobs:
steps
:
steps
:
-
uses
:
actions/checkout@v1
-
uses
:
actions/checkout@v1
-
name
:
cmake
-
name
:
cmake
run
:
cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug
run
:
cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug
-DJSON_BuildTests=On
-
name
:
build
-
name
:
build
run
:
cmake --build build --parallel
10
run
:
cmake --build build --parallel
10
-
name
:
test
-
name
:
test
...
...
.github/workflows/windows.yml
View file @
325e8ab8
...
@@ -10,7 +10,7 @@ jobs:
...
@@ -10,7 +10,7 @@ jobs:
steps
:
steps
:
-
uses
:
actions/checkout@v1
-
uses
:
actions/checkout@v1
-
name
:
cmake
-
name
:
cmake
run
:
cmake -S . -B build -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE=Debug
run
:
cmake -S . -B build -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE=Debug
-DJSON_BuildTests=On
-
name
:
build
-
name
:
build
run
:
cmake --build build --parallel
10
run
:
cmake --build build --parallel
10
-
name
:
test
-
name
:
test
...
...
.travis.yml
View file @
325e8ab8
...
@@ -321,13 +321,9 @@ script:
...
@@ -321,13 +321,9 @@ script:
# by default, use the single-header version
# by default, use the single-header version
-
if [[ "${MULTIPLE_HEADERS}" == "" ]]; then export MULTIPLE_HEADERS=OFF; fi
-
if [[ "${MULTIPLE_HEADERS}" == "" ]]; then export MULTIPLE_HEADERS=OFF; fi
# show OS/compiler version
-
uname -a
-
$CXX --version
# compile and execute unit tests
# compile and execute unit tests
-
mkdir -p build && cd build
-
mkdir -p build && cd build
-
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -GNinja && cmake --build . --config Release
-
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -GNinja && cmake --build . --config Release
-DJSON_BuildTests=On
-
ctest -C Release --timeout 2700 -V -j
-
ctest -C Release --timeout 2700 -V -j
-
cd ..
-
cd ..
...
...
README.md
View file @
325e8ab8
...
@@ -1501,7 +1501,7 @@ To compile and run the tests, you need to execute
...
@@ -1501,7 +1501,7 @@ To compile and run the tests, you need to execute
```
sh
```
sh
$
mkdir
build
$
mkdir
build
$
cd
build
$
cd
build
$
cmake ..
$
cmake ..
-DJSON_BuildTests
=
On
$
cmake
--build
.
$
cmake
--build
.
$
ctest
--output-on-failure
$
ctest
--output-on-failure
```
```
...
...
appveyor.yml
View file @
325e8ab8
...
@@ -112,7 +112,7 @@ before_build:
...
@@ -112,7 +112,7 @@ before_build:
# for with_win_header build, inject the inclusion of Windows.h to the single-header library
# for with_win_header build, inject the inclusion of Windows.h to the single-header library
-
ps
:
if ($env:name -Eq "with_win_header") { $header_path = "single_include\nlohmann\json.hpp" }
-
ps
:
if ($env:name -Eq "with_win_header") { $header_path = "single_include\nlohmann\json.hpp" }
-
ps
:
if ($env:name -Eq "with_win_header") { "#include <Windows.h>`n" + (Get-Content $header_path | Out-String) | Set-Content $header_path }
-
ps
:
if ($env:name -Eq "with_win_header") { "#include <Windows.h>`n" + (Get-Content $header_path | Out-String) | Set-Content $header_path }
-
if "%GENERATOR%"=="Ninja" (cmake . -G "%GENERATOR%" -DCMAKE_BUILD_TYPE="%configuration%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_EXE_LINKER_FLAGS="%LINKER_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"
) else (cmake . -G "%GENERATOR%" -A "%GENERATOR_PLATFORM%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_EXE_LINKER_FLAGS="%LINKER_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"
)
-
if "%GENERATOR%"=="Ninja" (cmake . -G "%GENERATOR%" -DCMAKE_BUILD_TYPE="%configuration%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_EXE_LINKER_FLAGS="%LINKER_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"
-DJSON_BuildTests=On) else (cmake . -G "%GENERATOR%" -A "%GENERATOR_PLATFORM%" -DCMAKE_CXX_FLAGS="%CXX_FLAGS%" -DCMAKE_EXE_LINKER_FLAGS="%LINKER_FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" -DJSON_BuildTests=On
)
build_script
:
build_script
:
-
cmake --build . --config "%configuration%"
-
cmake --build . --config "%configuration%"
...
...
test/CMakeLists.txt
View file @
325e8ab8
...
@@ -183,6 +183,7 @@ add_dependencies(json_unit download_test_data)
...
@@ -183,6 +183,7 @@ add_dependencies(json_unit download_test_data)
#############################################################################
#############################################################################
# Test the generated build configs
# Test the generated build configs
#############################################################################
#############################################################################
add_subdirectory
(
cmake_import
)
add_subdirectory
(
cmake_import
)
add_subdirectory
(
cmake_import_minver
)
add_subdirectory
(
cmake_import_minver
)
add_subdirectory
(
cmake_add_subdirectory
)
add_subdirectory
(
cmake_add_subdirectory
)
...
...
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