diff --git a/.travis.yml b/.travis.yml index 007c7e2d..b04142c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ matrix: - GAMOS=linux - PLATFORM=x86_64 - os: linux - name: "Linux 64-bit Precise custom compile" - dist: precise + name: "Linux 64-bit Trusty custom compile" language: bash env: - GAMOS=linux diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh index 163c2427..fd9188c6 100755 --- a/src/travis/linux-x86_64-before-install.sh +++ b/src/travis/linux-x86_64-before-install.sh @@ -1,3 +1,4 @@ +sudo /etc/init.d/postgresql stop echo "RUNNING: apt update..." sudo apt-get --yes update > /dev/null echo "RUNNING: apt dist-upgrade..." @@ -47,11 +48,10 @@ make install > /dev/null cd ~ export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib -$python=~/python/bin/python3 -$pip=~/python/bin/pip3 +python=~/python/bin/python3 +pip=~/python/bin/pip3 $python -V -ls -al ~/python/bin echo "Upgrading pip packages..." $pip freeze > upgrades.txt diff --git a/src/travis/windows-x86_64-before-install.sh b/src/travis/windows-x86_64-before-install.sh index 19c6b702..9e4ff54d 100755 --- a/src/travis/windows-x86_64-before-install.sh +++ b/src/travis/windows-x86_64-before-install.sh @@ -2,7 +2,7 @@ powershell Install-WindowsFeature Net-Framework-Core cinst -y python3 cinst -y openssl.light /c/Program\ Files/OpenSSL/openssl version -cp -v "/c/Program Files/OpenSSL/*.dll" "/c/Python37/DLLs" +cp -v /c/Program\ Files/OpenSSL/bin/*.dll /c/Python37/DLLs export PATH=$PATH:/c/Python37/scripts cinst -y wixtoolset pip install --upgrade pip