Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/composer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ name: Composer

env:
COMPOSE_USER: runner
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

on:
pull_request:
Expand Down Expand Up @@ -67,9 +68,10 @@ jobs:
# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1
docker compose run --rm --env COMPOSER_TOKEN --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
docker compose run --rm phpfpm composer install
# The real install.
docker compose run --rm --env COMPOSER_TOKEN phpfpm composer install

- run: |
docker compose run --rm phpfpm composer normalize --dry-run
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ name: PHP

env:
COMPOSE_USER: runner
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

on:
pull_request:
Expand Down Expand Up @@ -65,9 +66,10 @@ jobs:
# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1
docker compose run --rm --env COMPOSER_TOKEN --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
docker compose run --rm phpfpm composer install
# The real install.
docker compose run --rm --env COMPOSER_TOKEN phpfpm composer install

- run: |
docker compose run --rm phpfpm vendor/bin/phpcs
1 change: 1 addition & 0 deletions .github/workflows/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Project

env:
COMPOSE_USER: root
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

on:
pull_request:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/twig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ name: Twig

env:
COMPOSE_USER: runner
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

on:
pull_request:
Expand Down Expand Up @@ -55,9 +56,10 @@ jobs:
# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1
docker compose run --rm --env COMPOSER_TOKEN --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1
docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
docker compose run --rm phpfpm composer install
# The real install.
docker compose run --rm --env COMPOSER_TOKEN phpfpm composer install

- run: |
docker compose run --rm phpfpm vendor/bin/twig-cs-fixer lint
8 changes: 4 additions & 4 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ services:
- ./:/md

prettier:
# Prettier does not (yet, fcf.
# https://github.com/prettier/prettier/issues/15206) have an official
# docker image.
# https://hub.docker.com/r/jauderho/prettier is good candidate (cf. https://hub.docker.com/search?q=prettier&sort=updated_at&order=desc)
# Prettier does not (yet, cf.
# https://github.com/prettier/prettier/issues/15206) have an official docker
# image. https://hub.docker.com/r/jauderho/prettier is good candidate (cf.
# https://hub.docker.com/search?q=prettier&sort=updated_at&order=desc)
image: jauderho/prettier
profiles:
- dev
Expand Down
1 change: 1 addition & 0 deletions scripts/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ services:
MODULE_PATH: web/modules/contrib/$MODULE_NAME
# https://getcomposer.org/doc/03-cli.md#composer-ignore-platform-req-or-composer-ignore-platform-reqs
COMPOSER_IGNORE_PLATFORM_REQS: 1
COMPOSER_TOKEN: ${COMPOSER_TOKEN:-}
Loading