Skip to content

Commit

Permalink
Merge pull request #5601 from ampproject/enhancement/composer-v2-patch
Browse files Browse the repository at this point in the history
Add Composer v2 support for v2.0 of plugin
  • Loading branch information
westonruter authored Nov 15, 2020
2 parents c4be9f8 + a39f37c commit d0d8c6e
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 40 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-test-measure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
with:
php-version: '7.4'
coverage: none
tools: composer:v1

- name: Get Composer Cache Directory
id: composer-cache
Expand Down Expand Up @@ -109,7 +108,6 @@ jobs:
with:
php-version: '7.4'
coverage: none
tools: composer:v1

- name: Get Composer Cache Directory
id: composer-cache
Expand Down
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ branches:
- /^\d+\.\d+$/

install:
- travis_retry composer self-update --1
- nvm install
- composer install
- export DEV_LIB_PATH=vendor/xwp/wp-dev-lib/scripts
Expand Down Expand Up @@ -88,7 +87,6 @@ jobs:
name: Static analysis (PHP)
php: "7.4"
install:
- travis_retry composer self-update --1
- composer install
script:
- composer analyze
Expand All @@ -105,7 +103,6 @@ jobs:
php: "7.4"
env: WP_VERSION=latest DEV_LIB_SKIP=phpcs,eslint,xmllint,phpsyntax,phpunit
install:
- travis_retry composer self-update --1
- nvm install
- composer install
- npm install
Expand Down Expand Up @@ -166,7 +163,6 @@ jobs:
php: "5.6"
env: TEST_SKIP_PHPSTAN=1
install:
- travis_retry composer self-update --1
- composer --working-dir=lib/common install
- composer --working-dir=lib/optimizer install
script:
Expand All @@ -177,7 +173,6 @@ jobs:
php: "7.4"

install:
- travis_retry composer self-update --1
- composer --working-dir=lib/common install
- composer --working-dir=lib/optimizer install
script:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"ext-spl": "*",
"ampproject/common": "*",
"ampproject/optimizer": "*",
"cweagans/composer-patches": "1.6.7",
"cweagans/composer-patches": "1.7.0",
"fasterimage/fasterimage": "1.5.0",
"sabberworm/php-css-parser": "dev-master#bfdd976"
},
"require-dev": {
"civicrm/composer-downloads-plugin": "^2.1",
"civicrm/composer-downloads-plugin": "^3.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.0",
"mikey179/vfsstream": "1.6.8",
"mustache/mustache": "^2",
Expand Down
Loading

0 comments on commit d0d8c6e

Please sign in to comment.