diff --git a/.travis.yml b/.travis.yml index d6b7552a..83120e8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ if: tag IS blank -env: - - TESTING=FALSE matrix: include: @@ -18,11 +16,6 @@ matrix: env: - GAMOS=macos - PLATFORM=x86_64 - addons: - homebrew: - packages: - python@2 - update: true - os: windows language: shell env: @@ -39,22 +32,12 @@ matrix: env: - GAMOS=macos - PLATFORM=x86_64-sierra-testing - - TESTING=TRUE - addons: - homebrew: - packages: - python@2 - update: true - os: linux language: python dist: precise env: - GAMOS=linux - PLATFORM=x86 - - TESTING=TRUE - allow_failures: - -env: - TESTING=TRUE before_install: - source src/travis/$TRAVIS_OS_NAME-$PLATFORM-before-install.sh diff --git a/src/travis/linux-x86-before-install.sh b/src/travis/linux-x86-before-install.sh index e423783b..a359c862 100644 --- a/src/travis/linux-x86-before-install.sh +++ b/src/travis/linux-x86-before-install.sh @@ -1,9 +1,9 @@ sudo sh -c "echo 'foreign-architecture i386' > /etc/dpkg/dpkg.cfg.d/multiarch" -apt update -apt install -y python:i386 +sudo apt update +sudo apt install -y python:i386 python -V -pip install --upgrade pip -pip freeze > requirements.txt -pip install --upgrade -r requirements.txt -rm requirements.txt -pip install pyinstaller +sudo pip install --upgrade pip +sudo pip freeze > requirements.txt +sudo pip install --upgrade -r requirements.txt +sudo rm requirements.txt +sudo pip install pyinstaller diff --git a/src/travis/osx-x86_64-before-install.sh b/src/travis/osx-x86_64-before-install.sh index 453625c9..6024a964 100644 --- a/src/travis/osx-x86_64-before-install.sh +++ b/src/travis/osx-x86_64-before-install.sh @@ -1,3 +1,5 @@ +brew update +brew install python@2 pip install --upgrade pip pip freeze > requirements.txt pip install --upgrade -r requirements.txt diff --git a/src/travis/osx-x86_64-sierra-testing-before-install.sh b/src/travis/osx-x86_64-sierra-testing-before-install.sh index 4b1bd9f0..38b9661f 100644 --- a/src/travis/osx-x86_64-sierra-testing-before-install.sh +++ b/src/travis/osx-x86_64-sierra-testing-before-install.sh @@ -1,3 +1,5 @@ +brew update +brew install python@2 curl https://bootstrap.pypa.io/get-pip.py | sudo python pip freeze > requirements.txt sudo pip install --upgrade -r requirements.txt diff --git a/src/travis/windows-x86-install.sh b/src/travis/windows-x86-install.sh index 53278f67..32cd4bc4 100644 --- a/src/travis/windows-x86-install.sh +++ b/src/travis/windows-x86-install.sh @@ -4,6 +4,7 @@ gam/gam version export GAMVERSION=`gam/gam version simple` cp LICENSE gam cp GamCommands.txt gam +cp whatsnew.txt gam cp gam-setup.bat gam GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip /c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn diff --git a/src/travis/windows-x86_64-install.sh b/src/travis/windows-x86_64-install.sh index 58649269..29714249 100644 --- a/src/travis/windows-x86_64-install.sh +++ b/src/travis/windows-x86_64-install.sh @@ -4,6 +4,7 @@ gam/gam version export GAMVERSION=`gam/gam version simple` cp LICENSE gam cp GamCommands.txt gam +cp whatsnew.txt gam cp gam-setup.bat gam GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip /c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn