fix testing test, remove trusty

This commit is contained in:
Jay Lee
2020-03-29 19:43:34 -04:00
parent 615d571aef
commit 68745703f8
3 changed files with 5 additions and 9 deletions

View File

@@ -59,10 +59,6 @@ jobs:
name: "Linux ARM64 Xenial" name: "Linux ARM64 Xenial"
language: shell language: shell
filter_secrets: false filter_secrets: false
- os: linux
name: "Linux 64-bit Trusty"
dist: trusty
language: shell
- os: linux - os: linux
name: "Python 3.6 Source Testing" name: "Python 3.6 Source Testing"
dist: bionic dist: bionic

View File

@@ -1,4 +1,4 @@
if [ "$TRAVIS_JOB_NAME" == *"Testing" ]; then if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then
export python="python" export python="python"
export pip="pip" export pip="pip"
echo "Travis setup Python $TRAVIS_PYTHON_VERSION" echo "Travis setup Python $TRAVIS_PYTHON_VERSION"
@@ -91,7 +91,7 @@ else
python=~/python/bin/python3 python=~/python/bin/python3
pip=~/python/bin/pip3 pip=~/python/bin/pip3
if [ "${dist}" == "trusty" ]; then if ([ "${dist}" == "trusty" ] || [ "${dist}" == "xenial" ]); then
echo "Installing deps for StaticX..." echo "Installing deps for StaticX..."
if [ ! -d patchelf-$PATCHELF_VERSION ]; then if [ ! -d patchelf-$PATCHELF_VERSION ]; then
echo "Downloading PatchELF $PATCHELF_VERSION" echo "Downloading PatchELF $PATCHELF_VERSION"

View File

@@ -1,5 +1,5 @@
cd src cd src
if [ "$VMTYPE" == "test" ]; then if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then
export gam="$python gam.py" export gam="$python gam.py"
export gampath=$(readlink -e .) export gampath=$(readlink -e .)
else else
@@ -18,8 +18,8 @@ else
du -h gam/gam du -h gam/gam
time $gam version extended time $gam version extended
if [ "${dist}" == "trusty" ]; then if ([ "${dist}" == "trusty" ] || [ "$(dist)" == "xenial" ]); then
GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-${dist}legacy.tar.xz
$python -OO -m staticx gam/gam gam/gam-staticx $python -OO -m staticx gam/gam gam/gam-staticx
strip gam/gam-staticx strip gam/gam-staticx
rm gam/gam rm gam/gam