Clean up travis-ci file

This commit is contained in:
cytopia 2018-06-04 10:00:47 +02:00
parent 8f71c56a51
commit a06e7d5ea1
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2

View File

@ -97,30 +97,6 @@ env:
- S1=PHP V1=7.2 S2=PGSQL V2=10.0
###
### Build Matrix definition
###
#matrix:
# allow_failures:
# - env: S1=PHP V1=hhvm-latest S2=HTTPD V2=apache-2.2
#
###
### Berfore Install
###
before_install:
# Get newer docker version
- max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get update; then break; else i=$((i+1)); fi done
- max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce; then break; else i=$((i+1)); fi done
# Get newer docker-compose version
- max=100; i=0; while [ $i -lt $max ]; do if curl -L --retry 100 --retry-max-time 0 https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose; then break; else i=$((i+1)); fi done
- chmod +x docker-compose
- sudo mv -f docker-compose /usr/local/bin
# List versions
- docker version
- docker-compose version
###
### Installation
###
@ -133,6 +109,27 @@ install:
pip install sphinx_rtd_theme;
fi
# Install dependencies for docker/docker-compose
- if [ "${S1}" != "DOCUMENTATION" ]; then
max=100; i=0;
while [ $i -lt $max ]; do
if sudo apt-get update; then break; else i=$((i+1)); fi
done;
max=100; i=0;
while [ $i -lt $max ]; do
if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce; then break; else i=$((i+1)); fi
done;
max=100; i=0;
while [ $i -lt $max ]; do
if curl -L --retry 100 --retry-max-time 0 https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose; then break; else i=$((i+1)); fi
done;
chmod +x docker-compose;
sudo mv -f docker-compose /usr/local/bin;
fi
###
### Before Script
@ -153,6 +150,19 @@ before_script:
- sudo service mongodb stop || true
- netstat -tulpn
# Show Python/pip
- if [ "${S1}" = "DOCUMENTATION" ]; then
pip freeze;
pip --version;
python --version;
fi
# Show Docker/Docker Compose
- if [ "${S1}" != "DOCUMENTATION" ]; then
docker --version;
docker-compose --version;
fi
###
### Test