Merge branch 'release/4.x' of github.com:ec-europa/qa-automation into…

… release/4.x
ec-europa · Dec 11, 2019 · c008192 · c008192
2 parents 45c04c1 + 5af2b67
commit c008192
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -8,27 +8,27 @@ workspace:
 
 matrix:
   PHP_VERSION:
-    - 5.6
     - 7.1
+    - 7.2
 
 services:
   web:
-    image: fpfis/httpd-php-dev:${PHP_VERSION=5.6}
+    image: fpfis/httpd-php-dev:${PHP_VERSION=7.1}
     environment:
       - DOCUMENT_ROOT=/test/qa-automation
 
 pipeline:
   composer:
-    image: fpfis/httpd-php-dev:${PHP_VERSION=5.6}
+    image: fpfis/httpd-php-dev:${PHP_VERSION=7.1}
     commands:
       - composer install --no-suggest
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache
   phpcs:
-    image: fpfis/httpd-php-dev:${PHP_VERSION=5.6}
+    image: fpfis/httpd-php-dev:${PHP_VERSION=7.1}
     commands:
       - ./vendor/bin/phpcs -p
   phpunit:
-    image: fpfis/httpd-php-dev:${PHP_VERSION=5.6}
+    image: fpfis/httpd-php-dev:${PHP_VERSION=7.1}
     commands:
       - ./vendor/bin/phpunit phpcs/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # QA Automation change log
 
+## Version 4.0.2
+    * MULTISITE-22649: Create sniff to prevent commit of ASDA credentials
+    * MULTISITE-22670: Automatically update README.md with sniff list
+    * MULTISITE-22652: qa-automation 4.x package should only test on PHP 7.x
+
 ## Version 4.0.1
     * MULTISITE-21554: Port sniff QualityAssurance.Functions.DrupalHttpRequest to D8
     * MULTISITE-21555: Port sniff QualityAssurance.Functions.DrupalWrappers to D8