From 3890af9e1a4f3e44fd3288930b8f94480e12fe2a Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 28 Mar 2020 15:49:43 -0400 Subject: [PATCH] Drop precise, upgrade patchelf --- .travis.yml | 10 +--------- src/travis/linux-before-install.sh | 2 +- src/travis/linux-install.sh | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc4996a9..dbd6df9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - MIN_PYTHON_VERSION=3.8.1 - BUILD_OPENSSL_VERSION=1.1.1e - MIN_OPENSSL_VERSION=1.1.1d - - PATCHELF_VERSION=0.9 + - PATCHELF_VERSION=0.10 - PYINSTALLER_VERSION=3.5 - secure: "FSKvLaiqhKz21SVgAQZI3bSX34Ffyev4l+R2G//QXNDu6UVQcuFsykzw+eZEG7fkhotXr8BMDL7xIkookiL8eLwUtcd/Z95HCjPBBHcmCSQleyvuuJBxdrQ9xldmiGLzMCYiumSH9OH4uJhQ39Yjnjsa8TK+PlTci6a/BTzlYyBSyDYDf7Iv/uhfQPDHL3pNwrQPHf4fL6/jcvo+uaPcv83AVZkNzZjjyoi9Aa+uh9xlbyHg11jp44463qqxoxTdYik3pYuXRBPjknjOGcnFHqn+QOVSdRQoiwbmT8xVuYuCzTv9THhuJ//i5u7s4y3Xyl7u17B3tdm86UlMpQHy/w9EsYaSBPOU4oPNomRtOnTSugh0v9ZBwptP5XfbslII/iA+LQdzTHhchn0W0CRyDqjOMSestWlrsq5NZJtBJTYHbebllOhEI7xbj9tY+re1zFWSPMOPgHJP23ovsdk3hD9OT93AzRHInCx5IxL6QvEgRhAancRuGkf2rGP0g/vX9fQ0Il3rNMSQxHB5CyHUBtUJ9nhU79YkMDZicD0jFMEwjWJO3itAp3ynoLXRgktgQCYUfgc9SpdWKD5SXLCYnSo22JD3D1P6h2EertRHaoKRLb+CRXQC/lM8uh/W+BjA2Xe6Vut2I/72ndjM+10T7E2xk1CFyCH37a5p8cH26Fs=" - secure: "J9380tGLOZWa7dSH1y5Il8T5JQpN6ad81gI6VR1HIU0svpRdjgikyDA7ca2MKYDUYYY9yVSkTV6gCl6iIU/9+SKaYugpP+tkvdGYkC2moJdcTgYM/WOnIK9ExQ3BPhN1neGxJjPTwKo1ft27mtZ2I5vuCiBwIcnKWLnKPyW3PD+mWpfqiLuEzkHoAh6G3jC4qbcCrZDeX/knE+PzqESUEi+8k1G8gYcSDWujba9ypSsqZ8T/MXagGla6l7y2Rz+/KZTJmFHwKAA10V+xPLVqxoiqi4ar66yUqy0BamwRXPcseI+ns3Q+4lUpMqVQ5GlRy7LF1xC8myjmcAexXk0F9hg+CMzewKI8UgmQH/ZJvQZEh8s6mW26+CqA4d3zMQkWaR0WtEtpiuH7AGHCflIqvEQ6UiG7ia3B8iZfW2wl0j/kqx4OuHkS3r0pWKVVIIvCj9Ow2BHP7SpiV1AcUGsVxzwbgTh67fitna3Z3c6Uj8ccQlNr7ZIt1az6Wf3w5njijkLOiBpQSLKunTTCTSge/JzBTKUcie3RE9vzirl58gUxAt36nDtPWnory+RttMZrOkBVbTeSxp+IUe8pNwLFPHABsafXsjkfzBOtFmm+0ZXWt2Rlog5NvlemJfQUWDlsL4g+BSakzN+4sIPKzSauWDHyaEeULY7Uprkil6c5zwo=" @@ -83,14 +83,6 @@ jobs: - GAMOS=linux - PLATFORM=x86_64 - VMTYPE=build - - os: linux - name: "Linux 64-bit Precise" - dist: precise - language: shell - env: - - GAMOS=linux - - PLATFORM=x86_64 - - VMTYPE=build - os: linux name: "Python 3.6 Source Testing" dist: bionic diff --git a/src/travis/linux-before-install.sh b/src/travis/linux-before-install.sh index 811d276e..5b60600e 100755 --- a/src/travis/linux-before-install.sh +++ b/src/travis/linux-before-install.sh @@ -91,7 +91,7 @@ else python=~/python/bin/python3 pip=~/python/bin/pip3 - if ([ "${dist}" == "precise" ] || [ "${dist}" == "trusty" ]); then + if [ "${dist}" == "trusty" ]; then echo "Installing deps for StaticX..." if [ ! -d patchelf-$PATCHELF_VERSION ]; then echo "Downloading PatchELF $PATCHELF_VERSION" diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh index a1cd13f7..4ee6b874 100755 --- a/src/travis/linux-install.sh +++ b/src/travis/linux-install.sh @@ -18,8 +18,8 @@ else du -h gam/gam time $gam version extended - if ([ "${dist}" == "precise" ] || [ "${dist}" == "trusty" ]); then - GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-${dist}legacy.tar.xz + if [ "${dist}" == "trusty" ]; then + GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz $python -OO -m staticx gam/gam gam/gam-staticx strip gam/gam-staticx rm gam/gam