More clean up

Author: rimi-itk

Taskfile.yml

@@ -3,7 +3,7 @@
 version: '3'
 
 includes:
-  github-actions: ./task/Tasfile.github-actions.yml
+  github-actions: ./task/Taskfile.github-actions.yml
 
 vars:
   GITHUB_ACTIONS_TEMPLATES_HEADER: |

config/drupal/twig/.twig-cs-fixer.dist.php

@@ -2,14 +2,10 @@
 // https://github.com/VincentLanglet/Twig-CS-Fixer/blob/main/docs/configuration.md#configuration-file
 
 $finder = new TwigCsFixer\File\Finder();
-
-if (glob('web/*/custom/*/templates')) {
-  $finder->in('web/*/custom/*/templates');
-}
-// Include sub-modules or sub-themes
-if (glob('web/*/custom/*/*/templates')) {
-  $finder->in('web/*/custom/*/*/templates');
-}
+// Check all files …
+$finder->in(__DIR__);
+// … that are not ignored by VSC
+$finder->ignoreVCSIgnored(true);
 
 $config = new TwigCsFixer\Config\Config();
 $config->setFinder($finder);

config/symfony/twig/.twig-cs-fixer.dist.php

@@ -2,7 +2,10 @@
 // https://github.com/VincentLanglet/Twig-CS-Fixer/blob/main/docs/configuration.md#configuration-file
 
 $finder = new TwigCsFixer\File\Finder();
-$finder->in('templates');
+// Check all files …
+$finder->in(__DIR__);
+// … that are not ignored by VSC
+$finder->ignoreVCSIgnored(true);
 
 $config = new TwigCsFixer\Config\Config();
 $config->setFinder($finder);

docs/github-actions-templates.md

@@ -1,6 +1,6 @@
 <!-- DO NOT EDIT THIS FILE!
 
-It was automatically created by task/github-documentation-update.sh at Fri Apr  4 13:49:36 CEST 2025.
+It was automatically created by task/scripts/github-documentation-update.sh at Tue Apr  8 09:34:35 CEST 2025.
 -->
 # Github Actions templates
 
@@ -18,46 +18,30 @@ to match the new templates.
 
 ---
 
-[github/workflows/changelog.yaml](github/workflows/changelog.yaml)
-
-### Changelog
-
-Checks that changelog has been updated
-
----
-
-[github/workflows/composer.yaml](github/workflows/composer.yaml)
+[github/workflows/twig.yaml](github/workflows/twig.yaml)
 
-### Composer
+### Twigt
 
-Validates composer.json and checks that it's normalized.
+Validates Twig files
 
 #### Assumptions
 
 1. A docker compose service named `phpfpm` can be run and `composer` can be
    run inside the `phpfpm` service.
-2. [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize)
+2. [vincentlanglet/twig-cs-fixer](https://github.com/VincentLanglet/Twig-CS-Fixer)
    is a dev requirement in `composer.json`:
 
    ``` shell
-   docker compose run --rm phpfpm composer require --dev ergebnis/composer-normalize
-   ```
-
-   Normalize `composer.json` by running
-
-   ``` shell
-   docker compose run --rm phpfpm composer normalize
+   docker compose run --rm phpfpm composer require --dev vincentlanglet/twig-cs-fixer
    ```
 
----
-
-[github/workflows/drupal-php.yaml](github/workflows/drupal-php.yaml)
-
-Drupal PHP
+3. A [Configuration
+   file](https://github.com/VincentLanglet/Twig-CS-Fixer/blob/main/docs/configuration.md#configuration-file)
+   in the root of the project defines which files to check and rules to use.
 
 ---
 
-[github/workflows/drupal-site.yaml](github/workflows/drupal-site.yaml)
+[github/workflows/drupal/site.yaml](github/workflows/drupal/site.yaml)
 
 ### Drupal
 
@@ -73,9 +57,9 @@ pull request).
 
 ---
 
-[github/workflows/javascript.yaml](github/workflows/javascript.yaml)
+[github/workflows/drupal/php.yaml](github/workflows/drupal/php.yaml)
 
-JavaScript (and TypeScript)
+Drupal PHP
 
 ---
 
@@ -91,37 +75,53 @@ link all Markdown files (`**/*.md`) in the project.
 
 ---
 
-[github/workflows/styles.yaml](github/workflows/styles.yaml)
+[github/workflows/javascript.yaml](github/workflows/javascript.yaml)
 
-Styles (CSS and SCSS)
+JavaScript (and TypeScript)
 
 ---
 
-[github/workflows/symfony-php.yaml](github/workflows/symfony-php.yaml)
+[github/workflows/styles.yaml](github/workflows/styles.yaml)
 
-Symfony PHP
+Styles (CSS and SCSS)
 
 ---
 
-[github/workflows/twig.yaml](github/workflows/twig.yaml)
+[github/workflows/composer.yaml](github/workflows/composer.yaml)
 
-### Twigt
+### Composer
 
-Validates Twig files
+Validates composer.json and checks that it's normalized.
 
 #### Assumptions
 
 1. A docker compose service named `phpfpm` can be run and `composer` can be
    run inside the `phpfpm` service.
-2. [vincentlanglet/twig-cs-fixer](https://github.com/VincentLanglet/Twig-CS-Fixer)
+2. [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize)
    is a dev requirement in `composer.json`:
 
    ``` shell
-   docker compose run --rm phpfpm composer require --dev vincentlanglet/twig-cs-fixer
+   docker compose run --rm phpfpm composer require --dev ergebnis/composer-normalize
    ```
 
-3. A [Configuration
-   file](https://github.com/VincentLanglet/Twig-CS-Fixer/blob/main/docs/configuration.md#configuration-file)
-   in the root of the project defines which files to check and rules to use.
+   Normalize `composer.json` by running
+
+   ``` shell
+   docker compose run --rm phpfpm composer normalize
+   ```
+
+---
+
+[github/workflows/symfony/php.yaml](github/workflows/symfony/php.yaml)
+
+Symfony PHP
+
+---
+
+[github/workflows/changelog.yaml](github/workflows/changelog.yaml)
+
+### Changelog
+
+Checks that changelog has been updated
 
 ---

github/workflows/drupal-php.yaml renamed to github/workflows/drupal/php.yaml

@@ -2,7 +2,7 @@
 # github/workflows/twig.yaml in
 # https://github.com/itk-dev/devops_itkdev-docker if need be.
 
-### ### Twigt
+### ### Twig
 ###
 ### Validates Twig files
 ###

github/workflows/drupal-site.yaml renamed to github/workflows/drupal/site.yaml

@@ -6,7 +6,7 @@ tasks:
     cmds:
       - task: run-script
         vars:
-          SCRIPT: task/github-documentation-update.sh
+          SCRIPT: github-documentation-update
       - SKIP_FIX=1 task lint:markdown -- docs/github-actions-templates.md
 
   documentation:diff:
@@ -45,7 +45,7 @@ tasks:
           if [[ $(head --lines=1 "$f") =~ "^# " ]]; then
             # … replace the header.
             # This is done by deleting all lines from the top of the file to a blank line.
-            docker run --rm --volume=$PWD:/app --user ${COMPOSE_USER:-deploy} itkdev/php8.3-fpm:latest sed -i '1,/^$/d' "$f"
+            docker run --rm --volume=$PWD:/app --user ${COMPOSE_USER:-deploy} itkdev/php8.4-fpm:latest sed -i '1,/^$/d' "$f"
           fi
 
           # Write header and file into temporary file.
@@ -66,7 +66,7 @@ tasks:
     cmds:
       - task: run-script
         vars:
-          SCRIPT: task/github-actions-link.sh
+          SCRIPT: github-actions-link
     silent: true
 
   show:
@@ -78,7 +78,7 @@ tasks:
   run-script:
     internal: true
     cmds:
-      - docker run --rm --volume "$PWD:/app" --user ${COMPOSE_USER:-deploy} itkdev/php8.3-fpm:latest {{.SCRIPT}}
+      - docker run --rm --volume "$PWD:/app" --user ${COMPOSE_USER:-deploy} itkdev/php8.4-fpm:latest task/scripts/{{.SCRIPT}}
     requires:
       vars:
         - SCRIPT

github/workflows/symfony-php.yaml renamed to github/workflows/symfony/php.yaml

@@ -0,0 +1,24 @@
+<!-- DO NOT EDIT THIS FILE!
+
+It was automatically created by task/scripts/github-documentation-update.sh at Tue Apr  8 09:33:44 CEST 2025.
+-->
+# Github Actions templates
+
+This repository contains a number of [GitHub Actions](https://docs.github.com/en/actions) workflow template files that
+are copied to a project when running `itkdev-docker-compose template:install`. Any changes to the workflows should be
+made in [this repository](https://github.com/itk-dev/devops_itkdev-docker) and then the project template must be updated
+to match the new templates.
+
+## Naming conventions
+
+* Named after what a tool is concerned with, not how it's concerned with it.
+* Some configuration based on template type (drupal, symfony)
+
+## Templates
+
+---
+
+[github/workflows/*.yaml](github/workflows/*.yaml)
+
+
+---