Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mtxclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
mtxclient
Commits
967ebe98
Commit
967ebe98
authored
6 years ago
by
Joe Donofry
Browse files
Options
Downloads
Patches
Plain Diff
Adjust CI files for nlohmann
parent
33fe0150
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.ci/script.sh
+2
-0
2 additions, 0 deletions
.ci/script.sh
Dockerfile
+8
-2
8 additions, 2 deletions
Dockerfile
appveyor.yml
+1
-0
1 addition, 0 deletions
appveyor.yml
with
11 additions
and
2 deletions
.ci/script.sh
+
2
−
0
View file @
967ebe98
...
...
@@ -26,6 +26,8 @@ if [ $TRAVIS_OS_NAME == linux ]; then
fi
if
[
$TRAVIS_OS_NAME
==
osx
]
;
then
brew update
brew upgrade cmake boost
# Build dependencies.
cmake
-Hdeps
-B
.deps
-DCMAKE_BUILD_TYPE
=
Release
\
-DUSE_BUNDLED_BOOST
=
OFF
\
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
8
−
2
View file @
967ebe98
...
...
@@ -3,7 +3,7 @@ FROM ubuntu:14.04
ENV
LIBSODIUM_VERSION=1.0.16
ENV
SPDLOG_VERSION=1.1.0
ENV
OLM_VERSION=2.2.2
ENV
NLOHMANN_VERSION=v3.2.0
ENV
CMAKE_VERSION=3.12.1
ENV
CMAKE_SHORT_VERSION=3.12
...
...
@@ -73,7 +73,13 @@ RUN \
cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release && \
cmake --build build --target install && \
# json.hpp
curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \
mkdir /build/json && cd /build/json && \
git clone --branch ${NLOHMANN_VERSION} --depth 1 https://github.com/nlohmann/json && \
cd json && \
cmake . && \
make && \
make install
#curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \
rm -rf /build/* && \
rm -rf /var/lib/apt/lists/* && \
apt-get clean && \
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
+
1
−
0
View file @
967ebe98
...
...
@@ -17,6 +17,7 @@ install:
-
mingw32-make.exe --version
-
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-
vcpkg install
nlohmann-json:%PLATFORM%-windows
boost-asio:%PLATFORM%-windows
boost-beast:%PLATFORM%-windows
boost-iostreams:%PLATFORM%-windows
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment