Skip to content

Fixing build failure #222

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jun 11, 2020
Merged

Fixing build failure #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
002e137
Attempting to fix travis build failure
manodeep Jun 11, 2020
43d4ab0
Huh! The tests were only running on master
manodeep Jun 11, 2020
0fa492a
Show more info about the compiler
manodeep Jun 11, 2020
2077130
Disabling implicit-fallthrough-warning on travis
manodeep Jun 11, 2020
76e21c1
Updating to gcc-7 on all distros
manodeep Jun 11, 2020
9d1ed7e
Unsure if gcc-7 worked
manodeep Jun 11, 2020
f1b67cf
Use gcc-6 on trusty and gcc-7 on xenial
manodeep Jun 11, 2020
786a752
Revert back to default gcc (4.8) on trusty
manodeep Jun 11, 2020
243f9fc
No need to run doctest on legacy setup
manodeep Jun 11, 2020
b728978
Updated changelog [ci skip]
manodeep Jun 11, 2020
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
38 changes: 26 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ addons:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- libgsl0-dev
- gcc-7


matrix:
fast_finish: true
Expand Down Expand Up @@ -50,7 +50,6 @@ matrix:
before_install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh


- os: osx
osx_image: xcode8
compiler: clang
Expand All @@ -69,7 +68,7 @@ matrix:
dist: trusty
sudo: required
compiler: gcc
env: COMPILER=gcc PYTHON_VERSION=2.7
env: COMPILER=gcc PYTHON_VERSION=2.7 DOCTEST=false
before_install:
- wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh

Expand All @@ -82,18 +81,34 @@ matrix:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh

- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: gcc
env: COMPILER=gcc-7 PYTHON_VERSION=2.7
before_install:
- wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh

- os: linux
dist: xenial
sudo: required
compiler: gcc
env: COMPILER=gcc PYTHON_VERSION=3.6
env: COMPILER=gcc-7 PYTHON_VERSION=3.5
before_install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh

- os: linux
dist: trusty
dist: xenial
sudo: required
compiler: gcc
env: COMPILER=gcc-7 PYTHON_VERSION=3.6
before_install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh

- os: linux
dist: xenial
sudo: required
compiler: gcc
env: COMPILER=gcc PYTHON_VERSION=3.7 NUMPY_VERSION=1.16
env: COMPILER=gcc-7 PYTHON_VERSION=3.7 NUMPY_VERSION=1.16
before_install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh

Expand All @@ -107,6 +122,9 @@ install:
- python -m pip install --upgrade pip
- python -m pip install --ignore-installed certifi --upgrade
- python -m pip install sphinx>=1.8
- export CC=$COMPILER
- which $COMPILER
- $COMPILER --version
- make -r CC=$COMPILER
- make install CC=$COMPILER
- python -m pip install -e .
Expand All @@ -116,7 +134,3 @@ script:
- make tests CC=$COMPILER
- make -C docs html
- if [[ "${DOCTEST}" == "true" ]]; then make -C docs doctest ; fi

branches:
only:
- master
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Enhancements
------------
- A new helper routine to find the combination of (RA, DEC) refinements that produces fastest runtime in ``DDtheta_mocks`` [#216]
- Further testing via GitHub Actions [#220]
- Added Ubuntu-Xenial on Travis [#222]

Bug fixes
----------
Expand Down
7 changes: 6 additions & 1 deletion common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,12 @@ ifeq ($(DO_CHECKS), 1)

# Add the -Werror flag if running on some continuous integration provider
ifeq ($(CORRFUNC_CI), true)
CFLAGS += -Werror -Wno-unknown-warning-option -Wimplicit-fallthrough=1
CFLAGS += -Werror -Wno-unknown-warning-option
endif

# Add the implicit-fallthrough option *if not on* TRAVIS
ifneq ($(TRAVIS), true)
-CFLAGS += -Wimplicit-fallthrough=1
endif

GSL_FOUND := $(shell gsl-config --version 2>/dev/null)
Expand Down