From aa212692b39d3d5b0a75c95bc7865a54b90d376d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Wed, 6 Mar 2019 14:05:39 +0100 Subject: [PATCH] Update CircleCI configuration to newer PHP 7.3 Docker image [MAILPOET-1864] --- .circleci/config.yml | 18 ++++++------------ RoboFile.php | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9eb44c96af..df8f1c5373 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build_and_code_qa: working_directory: /home/circleci/mailpoet docker: - - image: mailpoet/wordpress:7.1_20181009.1 + - image: mailpoet/wordpress:7.3_20190306.1 environment: TZ: /usr/share/zoneinfo/Etc/UTC steps: @@ -17,9 +17,6 @@ jobs: - run: name: "Set up test environment" command: | - # Install NodeJS+NPM - curl -sL https://deb.nodesource.com/setup_11.x | sudo -E bash - - sudo apt-get install nodejs build-essential # install plugin dependencies curl -sL https://github.com/humbug/php-scoper/releases/download/0.11.4/php-scoper.phar --output php-scoper.phar chmod 755 php-scoper.phar @@ -56,7 +53,7 @@ jobs: static_analysis: working_directory: /home/circleci/mailpoet docker: - - image: mailpoet/wordpress:7.1_20181009.1 + - image: mailpoet/wordpress:7.3_20190306.1 - image: circleci/mysql:5.7 environment: TZ: /usr/share/zoneinfo/Etc/UTC @@ -287,7 +284,7 @@ jobs: php7_unit: working_directory: /home/circleci/mailpoet docker: - - image: mailpoet/wordpress:7.1_20181009.1 + - image: mailpoet/wordpress:7.3_20190306.1 - image: circleci/mysql:5.7 environment: TZ: /usr/share/zoneinfo/Etc/UTC @@ -318,7 +315,7 @@ jobs: php7_integration: working_directory: /home/circleci/mailpoet docker: - - image: mailpoet/wordpress:7.1_20181009.1 + - image: mailpoet/wordpress:7.3_20190306.1 - image: circleci/mysql:5.7 environment: TZ: /usr/share/zoneinfo/Etc/UTC @@ -349,7 +346,7 @@ jobs: php7_integration_multisite: working_directory: /home/circleci/mailpoet docker: - - image: mailpoet/wordpress:7.1_20181009.1 + - image: mailpoet/wordpress:7.3_20190306.1 - image: circleci/mysql:5.7 environment: TZ: /usr/share/zoneinfo/Etc/UTC @@ -380,7 +377,7 @@ jobs: build_release_zip: working_directory: /home/circleci/mailpoet docker: - - image: mailpoet/wordpress:7.1_20181009.1 + - image: mailpoet/wordpress:7.3_20190306.1 - image: circleci/mysql:5.7 environment: TZ: /usr/share/zoneinfo/Etc/UTC @@ -390,9 +387,6 @@ jobs: - run: name: "Set up environment" command: | - # Install NodeJS+NPM - curl -sL https://deb.nodesource.com/setup_11.x | sudo -E bash - - sudo apt-get install nodejs build-essential source ./.circleci/setup.bash && setup php7 sudo apt-get update sudo apt-get install python-pip gettext diff --git a/RoboFile.php b/RoboFile.php index 190b592564..8fe432e382 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -357,7 +357,7 @@ class RoboFile extends \Robo\Tasks { ->taskExec( './vendor/bin/phpcs '. '--standard=./tasks/code_sniffer/MailPoet '. - '--runtime-set testVersion 5.6-7.2 '. + '--runtime-set testVersion 5.6-7.3 '. '--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'. './lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '. 'lib/ '. @@ -366,7 +366,7 @@ class RoboFile extends \Robo\Tasks { ->taskExec( './vendor/bin/phpcs '. '--standard=./tasks/code_sniffer/MailPoet '. - '--runtime-set testVersion 5.6-7.2 '. + '--runtime-set testVersion 5.6-7.3 '. '--ignore=./tests/unit/_bootstrap.php,./tests/unit/_fixtures.php,./tests/integration/_bootstrap.php,./tests/integration/_fixtures.php '. 'tests/unit tests/integration tests/acceptance tests/DataFactories '. $severityFlag