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
80945477
Commit
80945477
authored
5 years ago
by
Nicolas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Bumb macos version for C++17
parent
8f896372
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/install.sh
+3
-5
3 additions, 5 deletions
.ci/install.sh
.ci/script.sh
+0
-2
0 additions, 2 deletions
.ci/script.sh
.travis.yml
+11
-1
11 additions, 1 deletion
.travis.yml
with
14 additions
and
8 deletions
.ci/install.sh
+
3
−
5
View file @
80945477
...
...
@@ -41,12 +41,10 @@ if [ $TRAVIS_OS_NAME == linux ]; then
cd
lcov-1.14/
sudo
make
install
)
fi
if
[
$TRAVIS_OS_NAME
==
osx
]
;
then
brew update
||
true
brew upgrade boost
||
true
brew
install
libsodium clang-format ninja
brew tap nlohmann/json
# the nlohmann install seems to make travis angry
# the nlohmann install seems to make travis angry
# because of the number of log messages
brew
install
--with-cmake
nlohmann_json
>
/dev/null
fi
This diff is collapsed.
Click to expand it.
.ci/script.sh
+
0
−
2
View file @
80945477
...
...
@@ -34,8 +34,6 @@ if [ $TRAVIS_OS_NAME == linux ]; then
fi
if
[
$TRAVIS_OS_NAME
==
osx
]
;
then
brew update
brew upgrade cmake boost
||
true
# Build dependencies.
cmake
-Hdeps
-B
.deps
-DCMAKE_BUILD_TYPE
=
Release
\
-DUSE_BUNDLED_BOOST
=
OFF
\
...
...
This diff is collapsed.
Click to expand it.
.travis.yml
+
11
−
1
View file @
80945477
...
...
@@ -10,10 +10,20 @@ services:
notifications
:
email
:
false
addons
:
homebrew
:
taps
:
nlohmann/json
packages
:
-
libsodium
-
clang-format
-
ninja
-
openssl
-
boost
matrix
:
include
:
-
os
:
osx
#
osx_image: xcode
9 # don't specify an image here to use the default
osx_image
:
xcode
10.2
# for c++17
compiler
:
clang
-
os
:
linux
compiler
:
gcc
...
...
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