From 48d67225f11f121b2418f042d9f946721109d5de Mon Sep 17 00:00:00 2001 From: David Ogilo Date: Fri, 15 Oct 2021 10:12:48 +0100 Subject: [PATCH 1/3] [CMS-2203] Updated behat/mink-selenium2-driver version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 98459e0..d547636 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "oomphinc/composer-installers-extender": "^1.1", "cweagans/composer-patches": "^1.6.5", "drupal-composer/drupal-scaffold": "^2.6", - "behat/mink-selenium2-driver": "1.4.x-dev as 1.3.x-dev", + "behat/mink-selenium2-driver": "~1.4", "dennisdigital/polaris": "^3.0" }, "conflict": { From 6c66e58f0ba4f6fcb3192e9c2a309696c28371eb Mon Sep 17 00:00:00 2001 From: David Ogilo Date: Fri, 15 Oct 2021 10:20:37 +0100 Subject: [PATCH 2/3] [CMS-2203] Changed circleci config to current branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a4f46a..d309949 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: command: | if [ -z "${PACKAGIST_TOKEN}" ]; then echo "Env variable PACKAGIST_TOKEN missing, get a token from packagist.org"; exit 1; fi composer config --global --auth http-basic.repo.packagist.com dennisdigital ${PACKAGIST_TOKEN} - composer create-project dennisdigital/polaris-drupal-project:3.x-dev /var/www/polaris --stability dev --no-interaction --no-install --profile -vvv + composer create-project dennisdigital/polaris-drupal-project:dev-CMS-2203-fix-mink-selenium2-composer-version /var/www/polaris --stability dev --no-interaction --no-install --profile -vvv cd /var/www/polaris composer --profile -vvv install From a351923c7f0b57198d2cee8e3a6a47718e4fee05 Mon Sep 17 00:00:00 2001 From: David Ogilo Date: Fri, 15 Oct 2021 10:29:16 +0100 Subject: [PATCH 3/3] [CMS-2203] Updated circleci config to use ${CIRCLE_BRANCH} --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d309949..94e6504 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: command: | if [ -z "${PACKAGIST_TOKEN}" ]; then echo "Env variable PACKAGIST_TOKEN missing, get a token from packagist.org"; exit 1; fi composer config --global --auth http-basic.repo.packagist.com dennisdigital ${PACKAGIST_TOKEN} - composer create-project dennisdigital/polaris-drupal-project:dev-CMS-2203-fix-mink-selenium2-composer-version /var/www/polaris --stability dev --no-interaction --no-install --profile -vvv + composer create-project dennisdigital/polaris-drupal-project:dev-${CIRCLE_BRANCH} /var/www/polaris --stability dev --no-interaction --no-install --profile -vvv cd /var/www/polaris composer --profile -vvv install