Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Stack Of Tasks
eigenpy
Commits
75aeba96
Verified
Commit
75aeba96
authored
5 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
ci: update travis to also Python 3 correctly
parent
1a53552c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+24
-8
24 additions, 8 deletions
.travis.yml
travis_custom/custom_build
+5
-1
5 additions, 1 deletion
travis_custom/custom_build
with
29 additions
and
9 deletions
.travis.yml
+
24
−
8
View file @
75aeba96
...
...
@@ -20,28 +20,44 @@ env:
jobs
:
include
:
-
dist
:
bionic
env
:
BUILDTYPE=Release
env
:
-
BUILDTYPE=Release
-
TRAVIS_PYTHON_VERSION=27
python
:
2.7
-
dist
:
bionic
env
:
BUILDTYPE=Release
env
:
-
BUILDTYPE=Release
-
TRAVIS_PYTHON_VERSION=36
python
:
3.6
-
dist
:
bionic
env
:
BUILDTYPE=Debug
env
:
-
BUILDTYPE=Debug
-
TRAVIS_PYTHON_VERSION=27
python
:
2.7
-
dist
:
bionic
env
:
BUILDTYPE=Debug
env
:
-
BUILDTYPE=Debug
-
TRAVIS_PYTHON_VERSION=36
python
:
3.6
-
dist
:
xenial
env
:
BUILDTYPE=Release
env
:
-
BUILDTYPE=Release
-
TRAVIS_PYTHON_VERSION=27
python
:
2.7
-
dist
:
xenial
env
:
BUILDTYPE=Release
env
:
-
BUILDTYPE=Release
-
TRAVIS_PYTHON_VERSION=35
python
:
3.5
-
dist
:
trusty
env
:
BUILDTYPE=Release
env
:
-
BUILDTYPE=Release
-
TRAVIS_PYTHON_VERSION=27
python
:
2.7
-
dist
:
trusty
env
:
BUILDTYPE=Release
env
:
-
BUILDTYPE=Release
-
TRAVIS_PYTHON_VERSION=34
python
:
3.4
notifications
:
...
...
This diff is collapsed.
Click to expand it.
travis_custom/custom_build
+
5
−
1
View file @
75aeba96
...
...
@@ -2,13 +2,17 @@
set
-e
# Setup environment variables.
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DBUILD_BENCHMARK=
\"
ON
\"
-DBUILD_UNIT_TESTS=
\"
ON
\"
-DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED
-DPYTHON_EXECUTABLE=
$(
which python
)
"
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DBUILD_BENCHMARK=
\"
ON
\"
-DBUILD_UNIT_TESTS=
\"
ON
\"
-DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
if
[[
";
${
DO_INSTALL_DOC_EXCEPT_ON_BRANCH
}
;"
==
*
";
${
CI_BRANCH
}
;"
*
]]
;
then
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DINSTALL_DOCUMENTATION=
\"
OFF
\"
"
else
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DINSTALL_DOCUMENTATION=
\"
ON
\"
"
fi
if
[[
$TRAVIS_PYTHON_VERSION
-gt
30
]]
;
then
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DPYTHON_EXECUTABLE=
$(
which python3
)
"
fi
# Setup environment variables.
.
./.travis/run ../.travis/build
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