diff --git a/.travis.yml b/.travis.yml index 4ad987f8..58b89e0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: - os: osx name: "MacOS 64-bit" language: generic - osx_image: xcode10.1 + osx_image: xcode9.2 env: - GAMOS=macos - PLATFORM=x86_64 @@ -53,7 +53,7 @@ script: - gam/gam version extended - gam/gam version | grep "Python 3\.7\.3" # We should be building with Python 3.7.3 - gam/gam version | grep travis # travis should be part of the path (not /tmp or such) -- gam/gam version extended | grep TLSv1\.3 # We should support TLS 1.3 to Google +- gam/gam version extended | grep TLSv1\.[23] # We should support TLS 1.3 to Google before_deploy: - export TRAVIS_TAG="preview" diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh index 416f3590..529e6869 100755 --- a/src/travis/linux-x86_64-before-install.sh +++ b/src/travis/linux-x86_64-before-install.sh @@ -11,7 +11,7 @@ sudo apt-get --yes install build-essential echo "Installing deps for python3" sudo cp -v /etc/apt/sources.list /tmp chmod a+rwx /tmp/sources.list -echo "deb-src http://archive.ubuntu.com/ubuntu/ precise main" >> /tmp/sources.list +echo "deb-src http://archive.ubuntu.com/ubuntu/ $dist main" >> /tmp/sources.list sudo cp -v /tmp/sources.list /etc/apt sudo apt-get --yes update > /dev/null sudo apt-get --yes build-dep python3 @@ -57,16 +57,9 @@ pip=~/python/bin/pip3 $python -V -if [[ "$dist" == "precise" ]]; then - echo "Installing patchelf for StaticX..." - # Compile patchelf (no ubuntu package till Xenial) - PATCHELF_VER=0.10 - wget https://nixos.org/releases/patchelf/patchelf-$PATCHELF_VER/patchelf-$PATCHELF_VER.tar.bz2 - tar xf patchelf-$PATCHELF_VER.tar.bz2 - cd patchelf-$PATCHELF_VER - ./configure - make - sudo make install +if [[ "$dist" == "xenial" ]]; then + echo "Installing deps for StaticX..." + sudo apt-get install --yes patchelf scons musl fi cd $whereibelong diff --git a/src/travis/linux-x86_64-install.sh b/src/travis/linux-x86_64-install.sh index 32ef4bdd..132f0908 100755 --- a/src/travis/linux-x86_64-install.sh +++ b/src/travis/linux-x86_64-install.sh @@ -12,7 +12,7 @@ echo "PyInstaller GAM info:" du -h gam/gam time gam/gam version extended -if [[ "$dist" == "precise" ]]; then +if [[ "$dist" == "xenial" ]]; then GAM_LEGACY_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-legacy.tar.xz $python -OO -m staticx gam/gam gam/gam-staticx strip gam/gam-staticx