Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
moose
Manage
Activity
Members
Labels
Plan
Issues
9
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sahil Moza
moose
Merge requests
!243
2018 sep20
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
2018 sep20
2018Sep20
into
master
Overview
1
Commits
6
Pipelines
0
Changes
32
Merged
Sahil Moza
requested to merge
2018Sep20
into
master
6 years ago
Overview
1
Commits
6
Pipelines
0
Changes
32
Expand
Created by: dilawar
Changes merged on Sep 20, 2018.
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
94ed5b6f
6 commits,
4 years ago
32 files
+
865
−
592
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
32
Search (e.g. *.vue) (Ctrl+P)
moose-core/.travis/travis_build_linux.sh
+
14
−
4
Options
@@ -40,24 +40,34 @@ unset PYTHONPATH
$PYTHON2
-m
compileall
-q
.
if
type
$PYTHON3
>
/dev/null
;
then
$PYTHON3
-m
compileall
-q
.
;
fi
# This is only applicable on linux build.
# Python2 and GSL.
echo
"Currently in
`
pwd
`
"
(
mkdir
-p
_GSL_BUILD
&&
cd
_GSL_BUILD
cmake
-DDEBUG
=
ON
-DPYTHON_EXECUTABLE
=
"
$PYTHON2
"
..
$MAKE
&&
ctest
--output-on-failure
sudo
make
install
&&
cd
/tmp
$PYTHON2
-c
'import moose;print(moose.__file__);print(moose.version())'
)
# Python3 with GSL and BOOST. This should be the only build after we drop
# python2 support.
echo
"Python3: Removed python2-networkx and install python3"
if
type
$PYTHON3
>
/dev/null
;
then
sudo
apt-get remove
-qq
python-networkx
||
echo
"Error with apt"
sudo
apt-get
install
-qq
python3-networkx
||
echo
"Error with apt"
# GSL.
(
mkdir
-p
_GSL_BUILD2
&&
cd
_GSL_BUILD2
&&
\
cmake
-DPYTHON_EXECUTABLE
=
"
$PYTHON3
"
-DDEBUG
=
ON ..
$MAKE
&&
ctest
--output-on-failure
$MAKE
&&
ctest
--output-on-failure
)
# BOOST
(
mkdir
-p
_BOOST_BUILD2
&&
cd
_BOOST_BUILD2
&&
\
cmake
-DWITH_BOOST_ODE
=
ON
-DPYTHON_EXECUTABLE
=
"
$PYTHON3
"
..
$MAKE
&&
ctest
--output-on-failure
$MAKE
&&
ctest
--output-on-failure
)
echo
"All done"
else