Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Last-minute CI fixes on Travis #479

Merged
merged 26 commits into from
Sep 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8238727
Leaner .travis.yml
robertodr Aug 31, 2018
ccd7883
We need Python 3.5 at least
robertodr Aug 31, 2018
86f7869
Add .editorconfig
robertodr Aug 31, 2018
6043669
User-friendly ch 10, r 4 ELF patching
robertodr Aug 31, 2018
ee2930e
Install chrpath and patchelf
robertodr Aug 31, 2018
72c8160
Prune Python packages to install
robertodr Aug 31, 2018
c0454eb
Sanitize .travis.yml
robertodr Aug 31, 2018
44ec3d0
Install prefix
robertodr Sep 1, 2018
baaf3c0
Use system-installed Python 3
robertodr Sep 1, 2018
728db60
Fixes for pathlib and ConfigParser.read
robertodr Sep 1, 2018
c96133d
Fix macOS
robertodr Sep 1, 2018
391f31e
Remove gfortran package
robertodr Sep 1, 2018
daf4d42
Set CC, CXX, and FC
robertodr Sep 1, 2018
0afa64b
Switch to latest CMake on Travis Linux
robertodr Sep 1, 2018
96bb63a
Fix for symlink blues
robertodr Sep 1, 2018
626f248
11/2 and 11/3 use tar/untar to unroll symlinks
bast Sep 1, 2018
c510974
Print RPATH as installation script
robertodr Sep 1, 2018
fe6860a
Remove the RPATH abomination
robertodr Sep 1, 2018
9c17902
exclude build directories when tar/untar-ing
bast Sep 1, 2018
c13f6d9
there is nothing to test under chapter-15
bast Sep 2, 2018
491f25e
also test chapter-09
bast Sep 2, 2018
9dfdd70
One missing package
robertodr Sep 2, 2018
a3e55c9
Skip chapter 9, recipe 4 on Travis
robertodr Sep 2, 2018
4fb7740
expect 14/3 to fail in Fortran example on Travis
bast Sep 2, 2018
6210caf
Skip chapter 14, recipe 3 on macOS too
robertodr Sep 2, 2018
7c19ef8
Skip ch 14, r 3, C++ example on macOS
robertodr Sep 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ build_script:
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-04'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-05'"
) else (
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-01/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-02/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-03/recipe-*'" &&
Expand All @@ -86,7 +85,8 @@ build_script:
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-10/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-12/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'"
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-13/recipe-*'" &&
bash -c "cd /c/projects/cmake-cookbook-no-symlinks && pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'"
)

deploy: off
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ variables:
pipenv run python testing/collect_tests.py 'chapter-08/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1,3]' &&
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-14/recipe-*'
Expand Down
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
charset = utf-8
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space

[*.py]
indent_size = 4

[*.{c,h,cpp,hpp,f90,F90}]
indent_size = 2

[*.rst]
indent_size = 3
tab_size = 3

[*.yml]
indent_size = 2
65 changes: 37 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,44 @@ matrix:
sources:
- ubuntu-toolchain-r-test
packages:
- chrpath
- doxygen
- g++-7
- g++-mingw-w64
- gcc-7
- gcc-mingw-w64
- gfortran
- gfortran-7
- gfortran-mingw-w64
- graphviz
- libatlas-dev
- libboost1.55-all-dev
- libboost-filesystem-dev
- libboost-python-dev
- libboost-test-dev
- liblapack-dev
- liblapacke-dev
- libopenmpi-dev
- libpython3-all-dev
- libpython3.5-dev
- libzmq3-dev
- openmpi-bin
- pkg-config
- python3
- python3-dev
- python3.5-dev
- rpm
- uuid-dev
env:
- CMAKE_VERSION="3.11.2"
- CMAKE_VERSION="3.12.1"
- CMAKE_GENERATOR="Unix Makefiles"
- BUILDFLAGS="VERBOSE=1"
- os: linux
addons: *1
env:
- CMAKE_VERSION="3.11.2"
- CMAKE_VERSION="3.12.1"
- CMAKE_GENERATOR="Unix Makefiles"
- BUILDFLAGS="VERBOSE=1"
- ANACONDA_TESTS_ONLY=1
- os: linux
addons: *1
env:
- CMAKE_VERSION="3.11.2"
- CMAKE_VERSION="3.12.1"
- CMAKE_GENERATOR="Ninja"
- BUILDFLAGS="-v"
- os: linux
Expand Down Expand Up @@ -89,7 +91,7 @@ cache:
pip: true
directories:
- $HOME/Deps/cmake/3.5.2
- $HOME/Deps/cmake/3.11.2
- $HOME/Deps/cmake/3.12.1
- $HOME/Deps/eigen
- $HOME/Deps/ninja
- $HOME/Deps/conda
Expand All @@ -101,10 +103,17 @@ env:
- LANG="en_US.UTF-8"
- LANGUAGE="en_US.UTF-8"
- PYTHONIOENCODING=UTF-8
# Invalidate PYENV_ROOT
- PYENV_ROOT=$HOME/fuffa

before_install:
# Dependencies are downloaded in $HOME/Downloads and installed in $HOME/Deps
- mkdir -p $HOME/Downloads $HOME/Deps
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
export PYTHON3="/usr/bin/python3.5";
else
export PYTHON3="/usr/local/bin/python3";
fi

install:
- ./testing/dependencies/travis/install.sh
Expand All @@ -113,33 +122,33 @@ install:
- ./testing/dependencies/travis/anaconda.sh
- ./testing/dependencies/travis/eigen.sh
- export PATH=$HOME/Deps/cmake/$CMAKE_VERSION/bin${PATH:+:$PATH}
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pipenv install --python `type -P python3.4`;
else
pipenv install --three;
fi
- pipenv install --python $PYTHON3
- pipenv run python --version

before_script:
- test -n $CC && unset CC
- test -n $CXX && unset CXX
- test -n $FC && unset FC
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
test -n $CC && unset CC && export CC=gcc-7;
test -n $CXX && unset CXX && export CXX=g++-7;
test -n $FC && unset FC && export FC=gfortran-7;
else
test -n $CC && unset CC && export CC=gcc;
test -n $CXX && unset CXX && export CXX=g++;
test -n $FC && unset FC && export FC=gfortran;
fi

script:
- ./testing/dependencies/report_versions.sh
- if [[ "$ANACONDA_TESTS_ONLY" == 1 ]]; then
travis_wait 20 pipenv run python testing/collect_tests.py 'chapter-11/recipe-04';
travis_wait 20 pipenv run python testing/collect_tests.py 'chapter-11/recipe-04' &&
travis_wait 20 pipenv run python testing/collect_tests.py 'chapter-11/recipe-05';
else
pipenv run python testing/collect_tests.py 'chapter-0[1-7]/recipe-*';
pipenv run python testing/collect_tests.py 'chapter-08/recipe-0(1|3|4|6)';
travis_wait 30 pipenv run python testing/collect_tests.py 'chapter-08/recipe-0(2|5)';
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*';
pipenv run python testing/collect_tests.py 'chapter-11/recipe-01*';
pipenv run python testing/collect_tests.py 'chapter-11/recipe-02';
pipenv run python testing/collect_tests.py 'chapter-11/recipe-03';
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*';
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*';
pipenv run python testing/collect_tests.py 'chapter-0[1-7]/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-08/recipe-0[1|3-5]' &&
travis_wait 30 pipenv run python testing/collect_tests.py 'chapter-08/recipe-02' &&
pipenv run python testing/collect_tests.py 'chapter-09/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-10/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-11/recipe-0[1-3]' &&
pipenv run python testing/collect_tests.py 'chapter-12/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-13/recipe-*' &&
pipenv run python testing/collect_tests.py 'chapter-14/recipe-*';
pipenv run python testing/collect_tests.py 'chapter-15/recipe-*';
fi
6 changes: 0 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,8 @@ colorama = "*"
cython = "*"
docopt = "*"
numpy = "*"
pathlib = "*"
pycodestyle = "*"
pyyaml = "*"
sphinx = "*"
sphinx-rtd-theme = "*"
sphinxcontrib-bibtex = "*"
typing = "*"


[dev-packages]

Loading