Skip to content

Commit

Permalink
Merge ddbbd0e into c60ebf7
Browse files Browse the repository at this point in the history
  • Loading branch information
cdunn2001 committed Oct 10, 2020
2 parents c60ebf7 + ddbbd0e commit 4f4df81
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
Expand Up @@ -7,12 +7,6 @@
language: cpp
sudo: false
addons:
homebrew:
packages:
- clang-format
- meson
- ninja
update: false # do not update homebrew by default
apt:
sources:
- ubuntu-toolchain-r-test
Expand All @@ -34,6 +28,7 @@ matrix:
CC="clang"
LIB_TYPE=static
BUILD_TYPE=release
PYTHONUSERBASE="$(pwd)/LOCAL"
script: ./.travis_scripts/meson_builder.sh
- name: Linux xenial clang meson static release testing
os: linux
Expand All @@ -44,6 +39,7 @@ matrix:
CC="clang"
LIB_TYPE=static
BUILD_TYPE=release
PYTHONUSERBASE="$(pwd)/LOCAL"
# before_install and install steps only needed for linux meson builds
before_install:
- source ./.travis_scripts/travis.before_install.${TRAVIS_OS_NAME}.sh
Expand Down
1 change: 1 addition & 0 deletions .travis_scripts/travis.before_install.linux.sh
Expand Up @@ -6,3 +6,4 @@ set -vex
# https://docs.travis-ci.com/user/languages/python/

pyenv global 3.7.1
pip3 install --user meson ninja
2 changes: 1 addition & 1 deletion .travis_scripts/travis.before_install.osx.sh
@@ -1 +1 @@
# NOTHING TO DO HERE
pip3 install --user meson ninja

0 comments on commit 4f4df81

Please sign in to comment.