diff --git a/.github/workflows/composer.yaml b/.github/workflows/composer.yaml index 27f9b87..bf15965 100644 --- a/.github/workflows/composer.yaml +++ b/.github/workflows/composer.yaml @@ -27,6 +27,7 @@ name: Composer env: COMPOSE_USER: runner + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: pull_request: @@ -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 diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml index 7bd917e..bccb17c 100644 --- a/.github/workflows/php.yaml +++ b/.github/workflows/php.yaml @@ -35,6 +35,7 @@ name: PHP env: COMPOSE_USER: runner + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: pull_request: @@ -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 diff --git a/.github/workflows/project.yaml b/.github/workflows/project.yaml index da5ae3d..712f7df 100644 --- a/.github/workflows/project.yaml +++ b/.github/workflows/project.yaml @@ -2,6 +2,7 @@ name: Project env: COMPOSE_USER: root + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: pull_request: diff --git a/.github/workflows/twig.yaml b/.github/workflows/twig.yaml index 8fc8b07..51535ad 100644 --- a/.github/workflows/twig.yaml +++ b/.github/workflows/twig.yaml @@ -25,6 +25,7 @@ name: Twig env: COMPOSE_USER: runner + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: pull_request: @@ -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 diff --git a/compose.yaml b/compose.yaml index 77994c4..297f981 100644 --- a/compose.yaml +++ b/compose.yaml @@ -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 diff --git a/scripts/compose.yaml b/scripts/compose.yaml index cb08be5..04157fe 100644 --- a/scripts/compose.yaml +++ b/scripts/compose.yaml @@ -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:-}