Skip to content

Commit

Permalink
Merge pull request #65 from fourkitchens/php-builds
Browse files Browse the repository at this point in the history
fix(php-builds): fix circleci php builds
  • Loading branch information
ccjjmartin authored Mar 22, 2022
2 parents 3a82669 + b4a5bcb commit aa2a3c7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
20 changes: 11 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ jobs:
- node/install-packages:
cache-path: ~/project/node_modules
override-ci-command: npm ci
# build_php:
# executor: php/default
# steps:
# - checkout
# - php/install-composer:
# install-version: 2.1.9
# - php/install-packages
build_php:
executor: php/default
steps:
- checkout
- php/install-composer:
install-version: 2.1.9
- run:
command: composer config -g github-oauth.github.com $COMPOSER_TOKEN
- php/install-packages
release:
executor:
name: node/default
Expand All @@ -33,11 +35,11 @@ workflows:
build:
jobs:
- build_node
# - build_php
- build_php
- release:
requires:
- build_node
# - build_php
- build_php
filters:
branches:
only:
Expand Down
9 changes: 8 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,14 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"drupal/console-extend-plugin": true,
"drupal/core-composer-scaffold": true,
"zaporylie/composer-drupal-optimizations": true
}
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit aa2a3c7

Please sign in to comment.