From d9122d489eed40cabdc69a1921fceeffa03660bf Mon Sep 17 00:00:00 2001 From: Peter Mounce Date: Tue, 24 Nov 2020 11:52:41 +0000 Subject: [PATCH 1/2] Fix CI; missing SSL libraries on macOS --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1ca47cb3..9528d7c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ jobs: - os: osx language: shell osx_image: xcode12.2 # macOS 10.15.7 Python 3.8.6 + before_install: + - brew install openssl # p4python needs SSL libraries to successfully build from source. - os: windows language: shell before_install: From fc033ef99a2336d7e8caa634bacae03daa69a0a8 Mon Sep 17 00:00:00 2001 From: Peter Mounce Date: Tue, 24 Nov 2020 12:00:08 +0000 Subject: [PATCH 2/2] differently --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9528d7c9..152a26ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,16 @@ jobs: - os: linux language: python python: 3.6 + - os: osx language: shell osx_image: xcode12.2 # macOS 10.15.7 Python 3.8.6 - before_install: - - brew install openssl # p4python needs SSL libraries to successfully build from source. + env: + # p4python needs SSL libraries to successfully build from source. + PATH: "/usr/local/opt/openssl@1.1/bin:$PATH" + LDFLAGS: "-L/usr/local/opt/openssl@1.1/lib" + CPPFLAGS: "-I/usr/local/opt/openssl@1.1/include" + - os: windows language: shell before_install: @@ -17,6 +22,7 @@ jobs: - ln -sf /c/Python38/python /c/Python38/python3 env: PATH: /c/Python38:/c/Python38/Scripts:$PATH + before_install: - python3 --version - pip3 install -U pip