Merge pull request #9 from itk-dev/hotfix/actions

Change task build

Author: martinyde

.github/workflows/pr.yml

@@ -7,19 +7,17 @@ on:
   pull_request:
 
 jobs:
-  test-prune-project:
+  changelog:
     runs-on: ubuntu-latest
-    name: Test prune project
-    env:
-      PROJECT_NAME: my-test-project
+    name: Changelog should be updated
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
 
-      # https://taskfile.dev/installation/#github-actions
-      - name: Setup Task
-        uses: arduino/setup-task@v2
+      - name: Git fetch
+        run: git fetch
 
-      - name: Prune project
-        run: |
-          task template-prune PROJECTNAME=$PROJECT_NAME
+      - name: Check that changelog has been updated.
+        run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0

.github/workflows/template_test.yml

@@ -0,0 +1 @@
+config/

.markdownlint.jsonc

@@ -7,13 +7,19 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
-* [PR-7](https://github.com/itk-dev/drupal-11-template/pull/7)
-  Miscellaneous
+## [1.0.0]
 
 ### Added
 
 * Template files added
 
+### Changed
+
+* [PR-9](https://github.com/itk-dev/drupal-11-template/pull/9)
+    - Fixed github actions.
+* [PR-7](https://github.com/itk-dev/drupal-11-template/pull/7)
+    - Miscellaneous
+
 [Keep a Changelog]: https://keepachangelog.com/en/1.1.0/
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 [Unreleased]: https://github.com/itk-dev/drupal-11-template/compare/main...develop

.prettierignore

@@ -22,12 +22,6 @@ Build a new project using this template (replace `{REPO_NAME}` with a proper Git
 gh repo create itk-dev/{REPO_NAME} --template itk-dev/drupal-11-template --public --clone
 ```
 
-Install the newest docker compose setup from [https://github.com/itk-dev/devops_itkdev-docker](https://github.com/itk-dev/devops_itkdev-docker).
-
-```shell
-task docker:install
-```
-
 ### Prune the project
 
 Prune the project to remove/override template specific files and set up the

CHANGELOG.md

@@ -1,37 +1,33 @@
 version: '3'
 
-dotenv: [".task.env", ".env"]
+dotenv: [".env.task", ".env"]
 
 tasks:
   template-prune:
-    name: Prune installation
     desc: Update the repository's files to match current project name
     cmds:
-      - |
-        cat <<'EOF' > .env
-        COMPOSE_PROJECT_NAME={{.PROJECTNAME}}
-        COMPOSE_DOMAIN={{.PROJECTNAME}}.local.itkdev.dk
-        EOF
-      - rm -R web/themes/custom/TEMPLATE_THEME
-      - |
-        cat <<'EOF' >> deploy-templates/settings.local.php
-
-        /**
-         * Set trusted host pattern.
-         */
-        $settings['trusted_host_patterns'][] = '^{{.PROJECTNAME}}\.local\.itkdev\.dk$';
-        EOF
+      # Modify contents of settings.local.yml and create .env file.
+      - PROJECTNAME={{.PROJECTNAME}} ./deploy-templates/scripts/modifyFilesContent.sh
+
+      # Add docker setup
+      - task docker:install
+
       # Move Drupal configuration files into place.
       - mkdir -p web/sites/default
       - mv deploy-templates/{settings.local.php,services.local.yml} web/sites/default/
+
+      # Set the actual project name in select files (Sed command different between mac and linux).
+      - task rename
+
+      # Remove build scripts
+      - rm -Rf deploy-templates/scripts
+
       # Move the rest of the files "here"
       - mv deploy-templates/* .
-      # Set the actual project name in select files.
-      - sed -i '' -e 's/{PROJECTNAME}/{{.PROJECTNAME}}/g' README.md CHANGELOG.md
+      # Remove deploy templates
       - rmdir deploy-templates
       # Remove workflows that make sense only in the template project
       - rm .github/workflows/template_*.yml
-
     requires:
       vars:
         - PROJECTNAME
@@ -41,7 +37,12 @@ tasks:
         msg: "PROJECTNAME should only contain lowercase a-z, digits and hyphens"
 
   docker:install:
-      name: Install ITKDev docker compose
       desc: Install docker compose templates (to get the newest version)
       cmds:
-        - itkdev-docker-compose template:install drupal-10 --force
+        - itkdev-docker-compose template:install drupal-11 --force
+
+  rename:
+    desc: Sed command fails in github actions, so we require darwin platform to avoid. @todo better approach.
+    cmds:
+      - docker run --rm --volume=$PWD:/app itkdev/php8.3-fpm:latest sed -i -e 's/{PROJECTNAME}/{{.PROJECTNAME}}/g' README.md CHANGELOG.md
+    platforms: ['darwin']