From bd0f94e7345368db48dff983ed72d3be6fe89c89 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 17 Feb 2017 13:28:29 -0600 Subject: [PATCH 1/3] Update required version of the-vagrant. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 186d834..67a8b1b 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,7 @@ "composer/installers": "^1.0", "drupal-composer/drupal-scaffold": "^1.0", "drupal/config_installer": "^1.0", - "drupal/core": "^8.0", - "palantirnet/the-build": "^1.0" + "drupal/core": "^8.0" }, "require-dev": { "behat/behat": "^3.1", @@ -49,7 +48,8 @@ "drupal/console": "^0.11.3", "drupal/drupal-extension": "^3.1", "drush/drush": "^8.0", - "palantirnet/the-vagrant": "^0.5", + "palantirnet/the-build": "^1.0", + "palantirnet/the-vagrant": "^1.0", "sculpin/sculpin": "~2.0", "sculpin/sculpin-theme-composer-plugin": "dev-master as 1.0.0" }, From 9b24a915231a1677af6a5f49313d757a0c7c0b76 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 17 Feb 2017 13:30:28 -0600 Subject: [PATCH 2/3] Remove sculpin dependencies. --- composer.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 67a8b1b..c00b5e6 100644 --- a/composer.json +++ b/composer.json @@ -42,16 +42,11 @@ "behat/mink": "^1.7", "behat/mink-extension": "^2.2", "behat/mink-goutte-driver": "^1.2", - "composer/composer": "@dev", - "dflydev/embedded-composer-console": "@dev", - "dflydev/embedded-composer-core": "@dev", "drupal/console": "^0.11.3", "drupal/drupal-extension": "^3.1", "drush/drush": "^8.0", "palantirnet/the-build": "^1.0", - "palantirnet/the-vagrant": "^1.0", - "sculpin/sculpin": "~2.0", - "sculpin/sculpin-theme-composer-plugin": "dev-master as 1.0.0" + "palantirnet/the-vagrant": "^1.0" }, "suggest": { "cweagans/composer-patches": "Try ^1.0. Apply patches to packages, especially Drupal.org contrib." From 1cc260b683d15faa8619d2d7955aa2e6057049f4 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 17 Feb 2017 13:34:04 -0600 Subject: [PATCH 3/3] Update drupal-skeleton testing on Circle. --- circle.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 6c223ff..7f1db4b 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,12 @@ machine: environment: PALANTIR_ENVIRONMENT: circle +general: + branches: + ignore: + - gh-pages + - /.*(readme|documentation).*/ + dependencies: pre: - cp $HOME/$CIRCLE_PROJECT_REPONAME/conf/apache.circle.conf /etc/apache2/sites-available/default @@ -21,7 +27,7 @@ dependencies: - composer config --global github-oauth.github.com $GITHUB_TOKEN override: - - composer install + - composer install --no-interaction - composer drupal-scaffold cache_directories: @@ -51,5 +57,4 @@ test: - vendor/bin/phing build install migrate override: - - vendor/bin/phing test - vendor/bin/behat --strict --format=junit --out=$CIRCLE_TEST_REPORTS