outman/jsoncpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jsonpath

Browse Source
This commit is contained in:
Wang Yuan 2021-11-01 18:58:15 +08:00 committed by GitHub
commit 40b44f3c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,5 +1,5 @@
# Build matrix / environment variables are explained on: # Build matrix / environment variables are explained on:
# http://about.travis-ci.org/docs/user/build-configuration/ # http://about.travis-ci.com/docs/user/build-configuration/
# This file can be validated on: http://www.yamllint.com/ # This file can be validated on: http://www.yamllint.com/
# Or using the Ruby based travel command line tool: # Or using the Ruby based travel command line tool:
# gem install travis --no-rdoc --no-ri # gem install travis --no-rdoc --no-ri

2
.travis_scripts/meson_builder.sh
View File

@ -64,7 +64,7 @@ ninja --version
_COMPILER_NAME=`basename ${CXX}` _COMPILER_NAME=`basename ${CXX}`
_BUILD_DIR_NAME="build-${BUILD_TYPE}_${LIB_TYPE}_${_COMPILER_NAME}" _BUILD_DIR_NAME="build-${BUILD_TYPE}_${LIB_TYPE}_${_COMPILER_NAME}"
./.travis_scripts/run-clang-format.sh #./.travis_scripts/run-clang-format.sh
meson --fatal-meson-warnings --werror --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . "${_BUILD_DIR_NAME}" meson --fatal-meson-warnings --werror --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . "${_BUILD_DIR_NAME}"
ninja -v -j 2 -C "${_BUILD_DIR_NAME}" ninja -v -j 2 -C "${_BUILD_DIR_NAME}"