codeship: run tests on PHP 7.1 7.2 and 7.3

tuxpiper · tuxpiper · commit 87117e63c311 · 2019-09-02T12:23:14.000+02:00
diff --git a/codeship-services.yml b/codeship-services.yml
@@ -38,33 +38,77 @@ deploy:
     DEPLOYMENT_RULES_VERSION: master
     DEPLOYMENT_RULES_FILE: platform.yml
 
-test:
-  build:
-    image: test
+
+mysql/base: &_mysql_base
+  image: mysql:5.7
+  environment:
+    - MYSQL_DATABASE=ushahidi
+    - MYSQL_USER=ushahidi
+    - MYSQL_PASSWORD=ushahidi
+    - MYSQL_ROOT_PASSWORD=root
+mysql-7.1:
+  <<: *_mysql_base
+mysql-7.2:
+  <<: *_mysql_base
+mysql-7.3:
+  <<: *_mysql_base
+
+
+test/base: &_test_defaults
+  build: &_test_build_defaults
     dockerfile_path: docker/test.Dockerfile
   volumes:
     - .:/vols/src
-  depends_on:
-    - mysql
-  environment:
-    - DB_HOST=mysql
-    - DB_PORT=3306
-    - DB_DATABASE=ushahidi
-    - DB_USERNAME=ushahidi
-    - DB_PASSWORD=ushahidi
-    - KOHANA_ENV=testing
+  environment: &_test_env_defaults
+    DB_PORT: 3306
+    DB_DATABASE: ushahidi
+    DB_USERNAME: ushahidi
+    DB_PASSWORD: ushahidi
+    KOHANA_ENV: testing
   extra_hosts:
     - "ushahidi.dev:127.0.0.1"
   cached: true
   default_cache_branch: develop
 
-mysql:
-  image: mysql:5.7
+test/php-7.1:
+  <<: *_test_defaults
+  build:
+    <<: *_test_build_defaults
+    image: test-7.1
+    args:
+      PHP_MAJOR_VERSION: "7.1"
   environment:
-    - MYSQL_DATABASE=ushahidi
-    - MYSQL_USER=ushahidi
-    - MYSQL_PASSWORD=ushahidi
-    - MYSQL_ROOT_PASSWORD=root
+    <<: *_test_env_defaults
+    DB_HOST: mysql-7.1
+  depends_on:
+    - mysql-7.1
+
+test/php-7.2:
+  <<: *_test_defaults
+  build:
+    <<: *_test_build_defaults
+    image: test-7.2
+    args:
+      PHP_MAJOR_VERSION: "7.2"
+  environment:
+    <<: *_test_env_defaults
+    DB_HOST: mysql-7.2
+  depends_on:
+    - mysql-7.2
+
+test/php-7.3:
+  <<: *_test_defaults
+  build:
+    <<: *_test_build_defaults
+    image: test-7.3
+    args:
+      PHP_MAJOR_VERSION: "7.3"
+  depends_on:
+    - mysql-7.3
+  environment:
+    <<: *_test_env_defaults
+    DB_HOST: mysql-7.3
+
 
 aglio:
   image: humangeo/aglio
diff --git a/codeship-steps.yml b/codeship-steps.yml
@@ -1,6 +1,16 @@
 - name: "Test"
-  service: test
-  command: test_reporter composer run test --timeout 0
+  type: parallel
+  steps:
+    - name: "Test PHP 7.1"
+      service: test/php-7.1
+      command: test_reporter composer run test --timeout 0
+    - name: "Test PHP 7.2"
+      service: test/php-7.2
+      command: test_reporter composer run test --timeout 0
+    - name: "Test PHP 7.3"
+      service: test/php-7.3
+      command: test_reporter composer run test --timeout 0
+
 
 - type: parallel
   steps:
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0 <=7.3",
+        "php": ">=7.0 <7.4",
         "aura/di": "~3.4",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-rackspace": "~1.0",
diff --git a/composer.lock b/composer.lock
diff --git a/docker/common.sh b/docker/common.sh
@@ -63,10 +63,10 @@ function run_composer_install {
 }
 
 function wait_for_mysql {
-  local db_host=${DB_HOST:-mysql}
+  local db_host=${DB_HOST}
   local db_port=${DB_PORT:-3306}
   until nc -z $db_host $db_port; do
-    >&2 echo "Mysql is unavailable - sleeping"
+    >&2 echo "Mysql ($db_host:$db_port) is unavailable - sleeping"
     sleep 1
   done
 }
diff --git a/docker/test.Dockerfile b/docker/test.Dockerfile
@@ -1,4 +1,5 @@
-FROM ushahidi/php-ci:php-7.0
+ARG PHP_MAJOR_VERSION
+FROM ushahidi/php-ci:php-${PHP_MAJOR_VERSION}
 
 WORKDIR /var/www
 COPY composer.json ./

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"require": {`
`18`		`- "php": ">=7.0 <=7.3",`
	`18`	`+ "php": ">=7.0 <7.4",`
`19`	`19`	`"aura/di": "~3.4",`
`20`	`20`	`"league/flysystem-aws-s3-v3": "~1.0",`
`21`	`21`	`"league/flysystem-rackspace": "~1.0",`
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,10 @@ function run_composer_install {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`function wait_for_mysql {`
`66`		`- local db_host=${DB_HOST:-mysql}`
	`66`	`+ local db_host=${DB_HOST}`
`67`	`67`	`local db_port=${DB_PORT:-3306}`
`68`	`68`	`until nc -z $db_host $db_port; do`
`69`		`- >&2 echo "Mysql is unavailable - sleeping"`
	`69`	`+ >&2 echo "Mysql ($db_host:$db_port) is unavailable - sleeping"`
`70`	`70`	`sleep 1`
`71`	`71`	`done`
`72`	`72`	`}`