Skip to content

Commit

Permalink
Merge pull request #62 from palantirnet/update-palantirnet-dependencies
Browse files Browse the repository at this point in the history
Update required version of the-vagrant.
  • Loading branch information
becw authored Feb 19, 2017
2 parents e35357d + 1cc260b commit 3289159
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
9 changes: 7 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
11 changes: 3 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,18 @@
"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",
"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-vagrant": "^0.5",
"sculpin/sculpin": "~2.0",
"sculpin/sculpin-theme-composer-plugin": "dev-master as 1.0.0"
"palantirnet/the-build": "^1.0",
"palantirnet/the-vagrant": "^1.0"
},
"suggest": {
"cweagans/composer-patches": "Try ^1.0. Apply patches to packages, especially Drupal.org contrib."
Expand Down

0 comments on commit 3289159

Please sign in to comment.