Skip to content

Commit

Permalink
Merge branch 'pantheon-systems-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Porter authored and Michael Porter committed Jul 25, 2018
2 parents dcf2cfd + 43070c3 commit 381845f
Show file tree
Hide file tree
Showing 5 changed files with 135 additions and 119 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Drupal editor configuration normalization
# @see http://editorconfig.org/

# This is the top-most .editorconfig file; do not search in parent directories.
root = true

# All files.
[*]
end_of_line = LF
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{composer.json,composer.lock}]
indent_size = 4
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ web/.eslintignore
web/.eslintrc
web/.gitattributes
web/.htaccess
web/.ht.router.php
web/autoload.php
web/index.php
web/robots.txt
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $ git commit -m "web and vendor directory from composer install"
$ git remote add origin ssh://[email protected]:2222/~/repository.git
$ git push --force origin master
```
Replace my-site with the name that you gave your Pantheon site, and replace ssh://[email protected]:2222/~/repository.git with the URL from the middle of the SSH clone URL from the Connection Info popup dialog on your dashboard.
* The `--team` flag is optional and refers to a Pantheon organization. Pantheon organizations are often web development agencies or Universities. Setting this parameter causes the newly created site to go within the given organization. Run the Terminus command `terminus org:list` to see the organizations you are a member of. There might not be any.

## Important files and directories

Expand All @@ -39,8 +39,5 @@ So that CircleCI will have some test to run, this repository includes a configur

## Updating your site

When using this repository to manage your Drupal site, you will no longer use the Pantheon dashboard to update your Drupal version. Instead, you will manage your updates using Composer. Updates can be applied either directly on Pantheon, by using Terminus, or on your local machine.

#### Update on your local machine

You may also place your site in Git mode, clone it locally, and then run composer commands from there. Commit and push your files back up to Pantheon as usual.
229 changes: 115 additions & 114 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,122 +1,123 @@
{
"name": "xenomedia/hebe-lite",
"description": "Install drops-8 with Composer on Pantheon.",
"type": "project",
"license": "MIT",
"repositories": {
"0": {
"type": "composer",
"url": "https://packages.drupal.org/8"
"name": "xenomedia/hebe-lite",
"description": "Install drops-8 with Composer on Pantheon.",
"type": "project",
"license": "MIT",
"repositories": {
"0": {
"type": "composer",
"url": "https://packages.drupal.org/8"
},
"1": {
"type": "composer",
"url": "https://asset-packagist.org"
}
},
"1": {
"type": "composer",
"url": "https://asset-packagist.org"
}
},
"require": {
"composer/installers": "^1.0.20",
"cweagans/composer-patches": "^1.0",
"drupal-composer/drupal-scaffold": "^2.0.1",
"drupal/config_direct_save": "^1.0",
"drupal/config_installer": "^1.0",
"drupal/console": "^1",
"drupal/core": "^8",
"drupal/simple_block": "^1.0@beta",
"drush/drush": "~8",
"rvtraveller/qs-composer-installer": "^1.1",
"webflo/drupal-core-strict": "^8",
"oomphinc/composer-installers-extender": "^1.1"
},
"require-dev": {
"mikey179/vfsstream": "^1.2",
"behat/behat": "3.*",
"behat/mink": "^1.7",
"behat/mink-extension": "^2.2",
"behat/mink-goutte-driver": "^1.2",
"jcalderonzumba/gastonjs": "^1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"drupal/drupal-extension": "^3.1",
"drush-ops/behat-drush-endpoint": "^0.0.4",
"pantheon-systems/quicksilver-pushback": "~1",
"phpunit/phpunit": "^4.8",
"symfony/css-selector": "^2.8"
},
"conflict": {
"drupal/drupal": "*"
},
"minimum-stability": "alpha",
"prefer-stable": true,
"autoload": {
"classmap": [
"scripts/composer/ScriptHandler.php"
]
},
"scripts": {
"build-assets": [
"@prepare-for-pantheon",
"composer install --optimize-autoloader"
],
"lint": "find web/modules/custom web/themes/custom -name '*.php' -exec php -l {} \\;",
"code-sniff": "echo 'No code sniff step defined.'",
"unit-test": "echo 'No unit test step defined.'",
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
"prepare-for-pantheon": "DrupalProject\\composer\\ScriptHandler::prepareForPantheon",
"post-install-cmd": [
"@drupal-scaffold",
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
"post-update-cmd": [
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
"post-create-project-cmd": [
"@drupal-scaffold",
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
]
},
"extra": {
"installer-types": [
"bower-asset",
"npm-asset"
],
"installer-paths": {
"web/core": ["type:drupal-core"],
"web/libraries/{$name}": [
"type:drupal-library",
"type:bower-asset",
"type:npm-asset"
],
"web/modules/contrib/{$name}": ["type:drupal-module"],
"web/profiles/contrib/{$name}": ["type:drupal-profile"],
"web/themes/contrib/{$name}": ["type:drupal-theme"],
"drush/contrib/{$name}": ["type:drupal-drush"]
"require": {
"composer/installers": "^1.0.20",
"cweagans/composer-patches": "^1.0",
"drupal-composer/drupal-scaffold": "^2.0.1",
"drupal/config_direct_save": "^1.0",
"drupal/config_installer": "^1.0",
"drupal/console": "^1",
"drupal/core": "^8",
"drupal/simple_block": "^1.0@beta",
"drush/drush": "~8",
"rvtraveller/qs-composer-installer": "^1.1",
"drush-ops/behat-drush-endpoint": "^0.0.5",
"webflo/drupal-core-strict": "^8",
"oomphinc/composer-installers-extender": "^1.1"
},
"build-env": {
"install-cms": [
"drush site-install standard --account-mail={account-mail} --account-name={account-name} --account-pass={account-pass} --site-mail={site-mail} --site-name={site-name} --yes",
"drush pm-enable config_direct_save simple_block --yes",
"drush pm-uninstall block_content --yes"
],
"export-configuration": "drush config-export --yes"
"require-dev": {
"mikey179/vfsstream": "^1.2",
"behat/behat": "3.*",
"behat/mink": "^1.7",
"behat/mink-extension": "^2.2",
"behat/mink-goutte-driver": "^1.2",
"jcalderonzumba/gastonjs": "^1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"drupal/drupal-extension": "^3.1",
"pantheon-systems/quicksilver-pushback": "~1",
"phpunit/phpunit": "^4.8",
"symfony/css-selector": "^2.8"
},
"conflict": {
"drupal/drupal": "*"
},
"minimum-stability": "alpha",
"prefer-stable": true,
"autoload": {
"classmap": [
"scripts/composer/ScriptHandler.php"
]
},
"drupal-scaffold": {
"source": "https://raw.githubusercontent.com/pantheon-systems/drops-8/{version}/{path}",
"includes": [
"sites/default/default.services.pantheon.preproduction.yml",
"sites/default/settings.pantheon.php"
"scripts": {
"build-assets": [
"@prepare-for-pantheon",
"composer install --optimize-autoloader"
],
"excludes": [
".csslintrc",
".editorconfig",
".eslintignore",
".eslintrc.json",
".htaccess",
"web.config"
"lint": "find web/modules/custom web/themes/custom -name '*.php' -exec php -l {} \\;",
"code-sniff": "echo 'No code sniff step defined.'",
"unit-test": "echo 'No unit test step defined.'",
"drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
"prepare-for-pantheon": "DrupalProject\\composer\\ScriptHandler::prepareForPantheon",
"post-install-cmd": [
"@drupal-scaffold",
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
"post-update-cmd": [
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
"post-create-project-cmd": [
"@drupal-scaffold",
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
]
},
"extra": {
"installer-types": [
"bower-asset",
"npm-asset"
],
"installer-paths": {
"web/core": ["type:drupal-core"],
"web/libraries/{$name}": [
"type:drupal-library",
"type:bower-asset",
"type:npm-asset"
],
"web/modules/contrib/{$name}": ["type:drupal-module"],
"web/profiles/contrib/{$name}": ["type:drupal-profile"],
"web/themes/contrib/{$name}": ["type:drupal-theme"],
"drush/contrib/{$name}": ["type:drupal-drush"]
},
"build-env": {
"install-cms": [
"drush site-install standard --account-mail={account-mail} --account-name={account-name} --account-pass={account-pass} --site-mail={site-mail} --site-name={site-name} --yes",
"drush pm-enable config_direct_save simple_block --yes",
"drush pm-uninstall block_content --yes"
],
"export-configuration": "drush config-export --yes"
},
"drupal-scaffold": {
"source": "https://raw.githubusercontent.com/pantheon-systems/drops-8/{version}/{path}",
"includes": [
"sites/default/default.services.pantheon.preproduction.yml",
"sites/default/settings.pantheon.php"
],
"excludes": [
".csslintrc",
".editorconfig",
".eslintignore",
".eslintrc.json",
".htaccess",
"web.config"
]
}
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
}
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
}
}
2 changes: 1 addition & 1 deletion tests/scripts/run-behat
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ terminus aliases
# Drush Behat driver fails without this option.
echo "\$options['strict'] = 0;" >> ~/.drush/pantheon.aliases.drushrc.php

export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"base_url" : "http://'$TERMINUS_ENV'-'$TERMINUS_SITE'.pantheonsite.io/"}, "Drupal\\DrupalExtension" : {"drush" : { "alias": "@pantheon.'$TERMINUS_SITE'.'$TERMINUS_ENV'" }}}}'
export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"base_url" : "https://'$TERMINUS_ENV'-'$TERMINUS_SITE'.pantheonsite.io/"}, "Drupal\\DrupalExtension" : {"drush" : { "alias": "@pantheon.'$TERMINUS_SITE'.'$TERMINUS_ENV'" }}}}'
cd tests && ../vendor/bin/behat --config=behat-pantheon.yml "$@"

0 comments on commit 381845f

Please sign in to comment.