From 2156139b5a4ff1c3a16dd179548d7fa30e169b1c Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 10 Dec 2017 23:18:57 +0800 Subject: [PATCH 1/5] merge independent services --- .travis.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a17b4ef2..7eabb1a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ env: matrix: - HUGO_VERSION=0.20.2 - - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis" - - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis" - - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb phpmyadmin postgres postgres-postgis pgadmin neo4j mongo redis" + - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" + - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" + - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" - PHP_VERSION=56 BUILD_SERVICE=workspace - PHP_VERSION=70 BUILD_SERVICE=workspace @@ -19,11 +19,11 @@ env: - PHP_VERSION=70 BUILD_SERVICE=php-fpm - PHP_VERSION=71 BUILD_SERVICE=php-fpm - - PHP_VERSION=hhvm BUILD_SERVICE="hhvm" + - PHP_VERSION=hhvm BUILD_SERVICE=hhvm - # - PHP_VERSION=56 BUILD_SERVICE="php-worker" - - PHP_VERSION=70 BUILD_SERVICE="php-worker" - - PHP_VERSION=71 BUILD_SERVICE="php-worker" + # - PHP_VERSION=56 BUILD_SERVICE=php-worker + - PHP_VERSION=70 BUILD_SERVICE=php-worker + - PHP_VERSION=71 BUILD_SERVICE=php-worker - PHP_VERSION=56 BUILD_SERVICE=mssql - PHP_VERSION=70 BUILD_SERVICE=mssql @@ -37,9 +37,8 @@ env: - PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike - - PHP_VERSION=56 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - - PHP_VERSION=70 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - - PHP_VERSION=71 BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq adminer elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" + - PHP_VERSION="N/A" BUILD_SERVICE="adminer phpmyadmin pgadmin" + - PHP_VERSION="N/A" BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" # Installing a newer Docker version before_install: From 407c08017d93959daf9ec273dc2d769b44d314e7 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 10 Dec 2017 23:23:03 +0800 Subject: [PATCH 2/5] add new services --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7eabb1a6..97eacbf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ env: - PHP_VERSION="N/A" BUILD_SERVICE="adminer phpmyadmin pgadmin" - PHP_VERSION="N/A" BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" + - PHP_VERSION="N/A" BUILD_SERVICE="kibana grafana laravel-echo-server aws" # Installing a newer Docker version before_install: From 64029d927068dd005ae8d2ec66b338593f03b881 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Sun, 10 Dec 2017 23:48:53 +0800 Subject: [PATCH 3/5] fix sed expression unknown option --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97eacbf3..bf4d19e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,9 @@ env: - PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike - - PHP_VERSION="N/A" BUILD_SERVICE="adminer phpmyadmin pgadmin" - - PHP_VERSION="N/A" BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - - PHP_VERSION="N/A" BUILD_SERVICE="kibana grafana laravel-echo-server aws" + - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin" + - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" + - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server aws" # Installing a newer Docker version before_install: From 81b34a72eb55f47818d254076f1bd940905828b0 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Mon, 11 Dec 2017 12:01:23 +0800 Subject: [PATCH 4/5] ignore aws service --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bf4d19e0..82751b8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,8 @@ env: - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin" - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server aws" + - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server" + # - PHP_VERSION=NA BUILD_SERVICE="aws" # Installing a newer Docker version before_install: From 1c194f5c875d5837690bce821d44c3b93c69ef59 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Mon, 11 Dec 2017 14:25:42 +0800 Subject: [PATCH 5/5] Merge duplicate services build job --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82751b8f..c56378a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,6 @@ env: matrix: - HUGO_VERSION=0.20.2 - - PHP_VERSION=56 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" - - PHP_VERSION=70 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" - - PHP_VERSION=71 BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" - - PHP_VERSION=56 BUILD_SERVICE=workspace - PHP_VERSION=70 BUILD_SERVICE=workspace - PHP_VERSION=71 BUILD_SERVICE=workspace @@ -37,6 +33,7 @@ env: - PHP_VERSION=70 BUILD_SERVICE=aerospike - PHP_VERSION=71 BUILD_SERVICE=aerospike + - PHP_VERSION=NA BUILD_SERVICE="applications blackfire minio percona nginx caddy apache2 mysql mariadb postgres postgres-postgis neo4j mongo redis" - PHP_VERSION=NA BUILD_SERVICE="adminer phpmyadmin pgadmin" - PHP_VERSION=NA BUILD_SERVICE="memcached beanstalkd beanstalkd-console rabbitmq elasticsearch certbot mailhog maildev selenium jenkins proxy proxy2 balancer" - PHP_VERSION=NA BUILD_SERVICE="kibana grafana laravel-echo-server"