From edf09a2d7b131f34163997efd0c56f1f64151dcc Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 27 Sep 2019 16:14:47 -0400 Subject: [PATCH] travis --- .travis.yml | 16 ++++++++-------- src/travis/linux-x86_64-before-install.sh | 5 ----- src/travis/osx-x86_64-before-install.sh | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d658d5d..4a1dcb1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,14 +37,14 @@ cache: matrix: include: -# - os: linux -# name: "Linux 64-bit Bionic" -# dist: bionic -# language: bash -# env: -# - GAMOS=linux -# - PLATFORM=x86_64 -# - VMTYPE=cache + - os: linux + name: "Linux 64-bit Bionic" + dist: bionic + language: bash + env: + - GAMOS=linux + - PLATFORM=x86_64 + - VMTYPE=build - os: linux name: "Linux 64-bit Xenial" dist: xenial diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh index 0ee9ef80..6c323d45 100755 --- a/src/travis/linux-x86_64-before-install.sh +++ b/src/travis/linux-x86_64-before-install.sh @@ -53,11 +53,6 @@ else tar xf Python-$BUILD_PYTHON_VERSION.tar.xz fi cd Python-$BUILD_PYTHON_VERSION - #if [[ "$dist" == "bionic" ]]; then - # echo "running bionic make clean" - # make clean - # rm Makefile - #fi echo "Compiling Python $BUILD_PYTHON_VERSION..." safe_flags="--with-openssl=$mypath/ssl --enable-shared --prefix=$mypath/python --with-ensurepip=upgrade" unsafe_flags="--enable-optimizations --with-lto" diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index ca16a17e..e722d40c 100755 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -13,7 +13,7 @@ cd ~/pybuild #sudo installer -pkg python-$BUILD_PYTHON_VERSION-macosx10.9.pkg -target / brew install openssl@1.1 -brew install python3 +brew upgrade python brew ls --verbose openssl@1.1 | grep libssl brew ls --verbose python3 | grep lib