From efa56720fb42ce52055237843089020d28871211 Mon Sep 17 00:00:00 2001 From: Steve Persch Date: Mon, 6 Nov 2017 14:13:35 -0800 Subject: [PATCH] Move quicksilver-pushback to require and not require-dev (#41) * Moving pantheon-systems/quicksilver-pushback to require * Adding readme todo * Add missing quotes to Quicksilver Pushback * Adding section on require vs require-dev to readme. * Moving quicksilver-pushback to require again after botched merge * Testing Quicksilver Pushback * Delete test file --- README.md | 2 +- composer.json | 14 ++++++------- composer.lock | 58 +++++++++++++++++++++++++-------------------------- pantheon.yml | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 68937ff8..5802654c 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Even within the `/web` directory you may notice that other directories and files #### `composer.json` -If you are just browsing this repository on GitHub, you may not see some of the directories mentioned above like `wp-admin`. That is because WordPress core and its plugins are installed via Composer and ignored in the `.gitignore` file. Specific plugins are added to the project via `composer.json` and `composer.lock` keeps track of the exact version of each plugin (or other dependency). Generic Composer dependencies (not WordPress plugins or themes) are downloaded to the `/vendor` folder. +If you are just browsing this repository on GitHub, you may not see some of the directories mentioned above like `wp-admin`. That is because WordPress core and its plugins are installed via Composer and ignored in the `.gitignore` file. Specific plugins are added to the project via `composer.json` and `composer.lock` keeps track of the exact version of each plugin (or other dependency). Generic Composer dependencies (not WordPress plugins or themes) are downloaded to the `/vendor` folder. Use the `require` section for any dependencies you wish to push to Pantheon, even those that might only be used on non-Live environments. Dependencies added in `require-dev` such as `php_codesniffer` or `phpunit` will not be pushed to Pantheon by the CI scripts. ## Behat tests diff --git a/composer.json b/composer.json index b4f82945..e9226754 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,14 @@ ], "require": { "composer/installers": "^1.3.0", - "vlucas/phpdotenv": "^2.4.0", - "wpackagist-plugin/wp-native-php-sessions": "^0.6.0", - "wpackagist-plugin/pantheon-advanced-page-cache": "^0.1.4", - "wpackagist-theme/twentyseventeen": "^1.1", + "pantheon-systems/quicksilver-pushback": "^1.0", "pantheon-systems/wordpress-composer": "^4.8.2", "roots/wp-password-bcrypt": "^1.0.0", - "rvtraveller/qs-composer-installer": "^1.1" + "rvtraveller/qs-composer-installer": "^1.1", + "vlucas/phpdotenv": "^2.4.0", + "wpackagist-plugin/pantheon-advanced-page-cache": "^0.1.4", + "wpackagist-plugin/wp-native-php-sessions": "^0.6.0", + "wpackagist-theme/twentyseventeen": "^1.1" }, "require-dev": { "roave/security-advisories": "dev-master", @@ -33,8 +34,7 @@ "squizlabs/php_codesniffer": "^2.9.0", "wp-coding-standards/wpcs": "dev-master", "phpunit/phpunit": "^6.1", - "brain/monkey": "^1.4", - "pantheon-systems/quicksilver-pushback": "~1" + "brain/monkey": "^1.4" }, "config": { "vendor-dir": "vendor", diff --git a/composer.lock b/composer.lock index 9057c5b0..b3df4853 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "747962c59deae7c9b27626762b9e555f", + "content-hash": "ae2f8302caec7a59567a719e8a866511", "packages": [ { "name": "composer/installers", @@ -171,6 +171,31 @@ ], "time": "2015-06-11T15:15:30+00:00" }, + { + "name": "pantheon-systems/quicksilver-pushback", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/pantheon-systems/quicksilver-pushback.git", + "reference": "32c65effd6802bdf829f1c68fb75ade2bd5894a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pantheon-systems/quicksilver-pushback/zipball/32c65effd6802bdf829f1c68fb75ade2bd5894a0", + "reference": "32c65effd6802bdf829f1c68fb75ade2bd5894a0", + "shasum": "" + }, + "require": { + "composer/installers": "~1.0" + }, + "type": "quicksilver-script", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Push commits made via the Pantheon dashboard back to original GitHub repository.", + "time": "2017-07-21T17:10:28+00:00" + }, { "name": "pantheon-systems/wordpress-composer", "version": "4.8.2", @@ -361,7 +386,7 @@ "dist": { "type": "zip", "url": "https://downloads.wordpress.org/plugin/pantheon-advanced-page-cache.0.1.5.zip", - "reference": null, + "reference": "tags/0.1.5", "shasum": null }, "require": { @@ -381,7 +406,7 @@ "dist": { "type": "zip", "url": "https://downloads.wordpress.org/plugin/wp-native-php-sessions.0.6.2.zip", - "reference": null, + "reference": "tags/0.6.2", "shasum": null }, "require": { @@ -401,7 +426,7 @@ "dist": { "type": "zip", "url": "https://downloads.wordpress.org/theme/twentyseventeen.1.3.zip", - "reference": null, + "reference": "1.3", "shasum": null }, "require": { @@ -1629,31 +1654,6 @@ ], "time": "2016-11-04T15:53:15+00:00" }, - { - "name": "pantheon-systems/quicksilver-pushback", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/pantheon-systems/quicksilver-pushback.git", - "reference": "32c65effd6802bdf829f1c68fb75ade2bd5894a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pantheon-systems/quicksilver-pushback/zipball/32c65effd6802bdf829f1c68fb75ade2bd5894a0", - "reference": "32c65effd6802bdf829f1c68fb75ade2bd5894a0", - "shasum": "" - }, - "require": { - "composer/installers": "~1.0" - }, - "type": "quicksilver-script", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Push commits made via the Pantheon dashboard back to original GitHub repository.", - "time": "2017-07-21T17:10:28+00:00" - }, { "name": "paulgibbs/behat-wordpress-extension", "version": "v0.8.0", diff --git a/pantheon.yml b/pantheon.yml index ecad9969..e4e63e40 100644 --- a/pantheon.yml +++ b/pantheon.yml @@ -15,5 +15,5 @@ workflows: sync_code: after: - type: webphp - description: Push changes back to GitHub if needed + description: 'Push changes back to GitHub if needed' script: private/scripts/quicksilver/quicksilver-pushback/push-back-to-github.php