diff --git a/.travis.yml b/.travis.yml index 1bf0f741..05a834a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ if: tag IS blank env: global: - - BUILD_PYTHON_VERSION=3.7.3 + - BUILD_PYTHON_VERSION=3.7.4 - BUILD_OPENSSL_VERSION=1.1.1c - PATCHELF_VERSION=0.9 - MUSL_VERSION=1.1.22 @@ -134,10 +134,12 @@ install: script: - $gam version extended - $gam version | grep travis # travis should be part of the path (not /tmp or such) -- if [ "$VMTYPE" == "build" ]; then $gam version | grep "Python ${BUILD_PYTHON_VERSION//./\\.}"; fi # We should be building with latest Python -- if [ "$VMTYPE" == "build" ]; then $gam version extended | grep "OpenSSL ${BUILD_OPENSSL_VERSION//./\\.}"; fi # We should be using OpenSSL 1.1.1+ +# determine which Python version GAM is built with and ensure it's at least build version from above. +- if [ "VMTYPE" == "build" ]; then vline=$(gamd version | grep "Python "); python_line=($vline); this_python=${python_line[1]}; tools/a_atleast_b.py $this_python $BUILD_PYTHON_VERSION; fi +# determine which OpenSSL version GAM is built with and ensure it's at least build version from above. +- if [ "VMTYPE" == "build" ]; then vline=$(gamd version extended | grep "OpenSSL "); openssl_line=($vline); this_openssl=${openssl_line[1]; tools/a_atleast_b.py $this_openssl $BUILD_OPENSSL_VERSION; fi - if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should default TLS 1.2 or 1.3 to Google -- if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail if server doesn't support our TLS version +- if [ "$VMTYPE" == "build" ]; then GAM_TLS_MIN_VERSION=TLSv1_2 $gam version extended location tls-v1-0.badssl.com:1010; [[ $? == 3 ]]; fi # expect fail since server doesn't support our TLS version - export jid="$(cut -d'.' -f2 <<<"$TRAVIS_JOB_NUMBER")" - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then export e2e=true; fi - if [ "$e2e" = true ]; then export gam_user=gam-travis-$jid@pdl.jaylee.us; fi diff --git a/src/travis/windows-x86-before-install.sh b/src/travis/windows-x86-before-install.sh index 73ad4a83..55436c97 100755 --- a/src/travis/windows-x86-before-install.sh +++ b/src/travis/windows-x86-before-install.sh @@ -2,22 +2,22 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cd ~/pybuild -export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe -if [ ! -e $exefile ]; then - echo "Downloading $exefile..." - wget --quiet https://slproweb.com/download/$exefile -fi -echo "Installing $exefile..." -powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" +#export exefile=Win32OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe +#if [ ! -e $exefile ]; then +# echo "Downloading $exefile..." +# wget --quiet https://slproweb.com/download/$exefile +#fi +#echo "Installing $exefile..." +#powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" cinst -y --forcex86 python3 until cinst -y wixtoolset; do echo "trying again..."; done -echo "OpenSSL dlls..." -ls -alRF /c/ssl -echo "c drive" -ls -al /c/ -echo "Python dlls..." -ls -al /c/Python37/DLLs -until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done +#echo "OpenSSL dlls..." +#ls -alRF /c/ssl +#echo "c drive" +#ls -al /c/ +#echo "Python dlls..." +#ls -al /c/Python37/DLLs +#until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts cd $mypath pip install --upgrade pip diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 0a04610c..431376ba 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -2,22 +2,22 @@ echo "Installing Net-Framework-Core..." export mypath=$(pwd) until powershell Install-WindowsFeature Net-Framework-Core; do echo "trying again..."; done cd ~/pybuild -export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe -if [ ! -e $exefile ]; then - echo "Downloading $exefile..." - wget --quiet https://slproweb.com/download/$exefile -fi -echo "Installing $exefile..." -powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" +#export exefile=Win64OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe +#if [ ! -e $exefile ]; then +# echo "Downloading $exefile..." +# wget --quiet https://slproweb.com/download/$exefile +#fi +#echo "Installing $exefile..." +#powershell ".\\${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl" cinst -y python3 until cinst -y wixtoolset; do echo "trying again..."; done -echo "OpenSSL dlls..." -ls -alRF /c/ssl -echo "c drive" -ls -al /c -echo "Python dlls..." -ls -al /c/Python37/DLLs -until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done +#echo "OpenSSL dlls..." +#ls -alRF /c/ssl +#echo "c drive" +#ls -al /c +#echo "Python dlls..." +#ls -al /c/Python37/DLLs +#until cp -v /c/ssl/*.dll /c/Python37/DLLs; do echo "trying again..."; done export PATH=$PATH:/c/Python37/scripts cd $mypath pip install --upgrade pip