From 6cca8e7fd59c39646bfa4e9eb3c027ed6ac0131c Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Wed, 2 Jul 2025 12:26:22 +0200 Subject: [PATCH 1/2] Put network creating in separate step. Added blank lines between steps. --- github/workflows/composer.yaml | 9 +++++++++ github/workflows/drupal-module/php.yaml | 3 +++ github/workflows/drupal/php.yaml | 3 +++ github/workflows/drupal/site.yaml | 9 ++++++--- github/workflows/symfony/php.yaml | 3 +++ github/workflows/twig.yaml | 2 ++ 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/github/workflows/composer.yaml b/github/workflows/composer.yaml index fe13351..33deec3 100644 --- a/github/workflows/composer.yaml +++ b/github/workflows/composer.yaml @@ -42,8 +42,11 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 + - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer validate --strict composer-normalized: @@ -52,8 +55,11 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 + - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer install docker compose run --rm phpfpm composer normalize --dry-run @@ -63,6 +69,9 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 + - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer audit diff --git a/github/workflows/drupal-module/php.yaml b/github/workflows/drupal-module/php.yaml index 4218f4d..d32f348 100644 --- a/github/workflows/drupal-module/php.yaml +++ b/github/workflows/drupal-module/php.yaml @@ -49,7 +49,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer install docker compose run --rm phpfpm vendor/bin/phpcs diff --git a/github/workflows/drupal/php.yaml b/github/workflows/drupal/php.yaml index 1bd5a93..244fc00 100644 --- a/github/workflows/drupal/php.yaml +++ b/github/workflows/drupal/php.yaml @@ -49,7 +49,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer install docker compose run --rm phpfpm vendor/bin/phpcs diff --git a/github/workflows/drupal/site.yaml b/github/workflows/drupal/site.yaml index 92ce5ab..b49ad2c 100644 --- a/github/workflows/drupal/site.yaml +++ b/github/workflows/drupal/site.yaml @@ -35,9 +35,11 @@ jobs: steps: - uses: actions/checkout@v4 + - run: | + docker network create frontend + - name: Start docker and install dependencies run: | - docker network create frontend docker compose pull docker compose up --detach @@ -71,9 +73,11 @@ jobs: with: ref: ${{ github.base_ref }} + - run: | + docker network create frontend + - name: Start docker and install dependencies run: | - docker network create frontend docker compose pull docker compose up --detach @@ -111,7 +115,6 @@ jobs: - name: Start docker and install dependencies run: | - docker network create frontend || true docker compose pull docker compose up --detach diff --git a/github/workflows/symfony/php.yaml b/github/workflows/symfony/php.yaml index 60fb70e..51364b7 100644 --- a/github/workflows/symfony/php.yaml +++ b/github/workflows/symfony/php.yaml @@ -49,8 +49,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer install # https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/usage.rst#the-check-command docker compose run --rm phpfpm vendor/bin/php-cs-fixer fix --dry-run --diff diff --git a/github/workflows/twig.yaml b/github/workflows/twig.yaml index 9b0e343..655e463 100644 --- a/github/workflows/twig.yaml +++ b/github/workflows/twig.yaml @@ -44,5 +44,7 @@ jobs: - run: | docker network create frontend + + - run: | docker compose run --rm phpfpm composer install docker compose run --rm phpfpm vendor/bin/twig-cs-fixer lint From da67694d2e845dcdb4ef10dfce73d9e2f1f645c9 Mon Sep 17 00:00:00 2001 From: Mikkel Ricky Date: Thu, 3 Jul 2025 16:25:04 +0200 Subject: [PATCH 2/2] Added step names --- .github/workflows/markdown.yaml | 3 ++- .github/workflows/yaml.yaml | 3 ++- github/workflows/composer.yaml | 9 ++++++--- github/workflows/drupal-module/javascript.yaml | 3 ++- github/workflows/drupal-module/php.yaml | 3 ++- github/workflows/drupal-module/styles.yaml | 3 ++- github/workflows/drupal/javascript.yaml | 3 ++- github/workflows/drupal/php.yaml | 3 ++- github/workflows/drupal/site.yaml | 6 ++++-- github/workflows/drupal/styles.yaml | 3 ++- github/workflows/markdown.yaml | 3 ++- github/workflows/symfony/javascript.yaml | 3 ++- github/workflows/symfony/php.yaml | 3 ++- github/workflows/symfony/styles.yaml | 3 ++- github/workflows/twig.yaml | 3 ++- github/workflows/yaml.yaml | 3 ++- 16 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.github/workflows/markdown.yaml b/.github/workflows/markdown.yaml index 60fc0ee..f8bcf09 100644 --- a/.github/workflows/markdown.yaml +++ b/.github/workflows/markdown.yaml @@ -36,7 +36,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/.github/workflows/yaml.yaml b/.github/workflows/yaml.yaml index 1c0ada3..8c60963 100644 --- a/.github/workflows/yaml.yaml +++ b/.github/workflows/yaml.yaml @@ -33,7 +33,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/composer.yaml b/github/workflows/composer.yaml index 33deec3..6c3a30c 100644 --- a/github/workflows/composer.yaml +++ b/github/workflows/composer.yaml @@ -43,7 +43,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | @@ -56,7 +57,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | @@ -70,7 +72,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/drupal-module/javascript.yaml b/github/workflows/drupal-module/javascript.yaml index 54ef6e2..2a2f625 100644 --- a/github/workflows/drupal-module/javascript.yaml +++ b/github/workflows/drupal-module/javascript.yaml @@ -29,7 +29,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/drupal-module/php.yaml b/github/workflows/drupal-module/php.yaml index d32f348..95c22ed 100644 --- a/github/workflows/drupal-module/php.yaml +++ b/github/workflows/drupal-module/php.yaml @@ -50,7 +50,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/drupal-module/styles.yaml b/github/workflows/drupal-module/styles.yaml index 0d5cdc0..9e75d75 100644 --- a/github/workflows/drupal-module/styles.yaml +++ b/github/workflows/drupal-module/styles.yaml @@ -29,7 +29,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/drupal/javascript.yaml b/github/workflows/drupal/javascript.yaml index 65d5468..9779305 100644 --- a/github/workflows/drupal/javascript.yaml +++ b/github/workflows/drupal/javascript.yaml @@ -29,7 +29,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/drupal/php.yaml b/github/workflows/drupal/php.yaml index 244fc00..c688159 100644 --- a/github/workflows/drupal/php.yaml +++ b/github/workflows/drupal/php.yaml @@ -50,7 +50,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/drupal/site.yaml b/github/workflows/drupal/site.yaml index b49ad2c..db14b45 100644 --- a/github/workflows/drupal/site.yaml +++ b/github/workflows/drupal/site.yaml @@ -35,7 +35,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - name: Start docker and install dependencies @@ -73,7 +74,8 @@ jobs: with: ref: ${{ github.base_ref }} - - run: | + - name: Create docker network + run: | docker network create frontend - name: Start docker and install dependencies diff --git a/github/workflows/drupal/styles.yaml b/github/workflows/drupal/styles.yaml index 049af20..ed630dd 100644 --- a/github/workflows/drupal/styles.yaml +++ b/github/workflows/drupal/styles.yaml @@ -29,7 +29,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/markdown.yaml b/github/workflows/markdown.yaml index 60fc0ee..f8bcf09 100644 --- a/github/workflows/markdown.yaml +++ b/github/workflows/markdown.yaml @@ -36,7 +36,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/symfony/javascript.yaml b/github/workflows/symfony/javascript.yaml index 5b20c8d..ca0cbe7 100644 --- a/github/workflows/symfony/javascript.yaml +++ b/github/workflows/symfony/javascript.yaml @@ -29,7 +29,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/symfony/php.yaml b/github/workflows/symfony/php.yaml index 51364b7..d324097 100644 --- a/github/workflows/symfony/php.yaml +++ b/github/workflows/symfony/php.yaml @@ -50,7 +50,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/symfony/styles.yaml b/github/workflows/symfony/styles.yaml index edc7960..b0bcf17 100644 --- a/github/workflows/symfony/styles.yaml +++ b/github/workflows/symfony/styles.yaml @@ -29,7 +29,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/twig.yaml b/github/workflows/twig.yaml index 655e463..f9ceac8 100644 --- a/github/workflows/twig.yaml +++ b/github/workflows/twig.yaml @@ -42,7 +42,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: | diff --git a/github/workflows/yaml.yaml b/github/workflows/yaml.yaml index 1c0ada3..8c60963 100644 --- a/github/workflows/yaml.yaml +++ b/github/workflows/yaml.yaml @@ -33,7 +33,8 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | + - name: Create docker network + run: | docker network create frontend - run: |