Skip to content

Commit f1c76e2

Browse files
committed
4850: Linted YAML. Cleaned up.
1 parent 27d7031 commit f1c76e2

90 files changed

Lines changed: 750 additions & 1043 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
push:
33
tags:
4-
- '*.*.*'
4+
- "*.*.*"
55

66
name: Create Github Release
77

.github/workflows/composer.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
- uses: actions/checkout@v4
4545
- run: |
4646
docker network create frontend
47+
- run: |
4748
docker compose run --rm phpfpm composer validate --strict
4849
4950
composer-normalized:
@@ -54,6 +55,7 @@ jobs:
5455
- uses: actions/checkout@v4
5556
- run: |
5657
docker network create frontend
58+
- run: |
5759
docker compose run --rm phpfpm composer install
5860
docker compose run --rm phpfpm composer normalize --dry-run
5961
@@ -65,4 +67,5 @@ jobs:
6567
- uses: actions/checkout@v4
6668
- run: |
6769
docker network create frontend
68-
docker compose run --rm phpfpm composer audit
70+
- run: |
71+
docker compose run --rm phpfpm composer audit --locked

.github/workflows/pr.yaml

Lines changed: 2 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -29,105 +29,6 @@ jobs:
2929
- name: npm audit
3030
run: docker compose run --rm node npm audit --prefix /app/web/themes/custom/hoeringsportal
3131

32-
changelog:
33-
runs-on: ubuntu-latest
34-
name: Changelog should be updated
35-
strategy:
36-
fail-fast: false
37-
steps:
38-
- name: Checkout
39-
uses: actions/checkout@v4
40-
with:
41-
fetch-depth: 2
42-
43-
- name: Git fetch
44-
run: git fetch
45-
46-
- name: Check that changelog has been updated.
47-
run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0
48-
49-
test-composer-files:
50-
name: Validate composer
51-
runs-on: ubuntu-latest
52-
steps:
53-
- uses: actions/checkout@v4
54-
- uses: arduino/setup-task@v2
55-
# https://github.com/arduino/setup-task/tree/56d0cc033e3cecc5f07a291fdd39f29388d21800?tab=readme-ov-file#repo-token
56-
with:
57-
repo-token: ${{ secrets.GITHUB_TOKEN }}
58-
59-
- run: |
60-
docker network create frontend
61-
task compose -- up --detach
62-
task composer -- install
63-
64-
- name: Validate composer files
65-
run: |
66-
task composer -- validate
67-
- name: Check composer file is normalized
68-
run: |
69-
task composer -- normalize --dry-run
70-
71-
coding-standards-assets:
72-
name: Assets - Check Coding Standards
73-
runs-on: ubuntu-latest
74-
steps:
75-
- uses: actions/checkout@v4
76-
- uses: arduino/setup-task@v2
77-
with:
78-
repo-token: ${{ secrets.GITHUB_TOKEN }}
79-
80-
- run: task coding-standards:assets:check
81-
# Check for any changes (task …:check runs task …:apply)
82-
- run: git diff --exit-code
83-
84-
coding-standards-markdown:
85-
name: Markdown - Check Coding Standards
86-
runs-on: ubuntu-latest
87-
steps:
88-
- uses: actions/checkout@v4
89-
- uses: arduino/setup-task@v2
90-
with:
91-
repo-token: ${{ secrets.GITHUB_TOKEN }}
92-
93-
- run: task coding-standards:markdown:check
94-
# Check for any changes (task …:check runs task …:apply)
95-
- run: git diff --exit-code
96-
97-
coding-standards-php:
98-
name: PHP - Check Coding Standards
99-
runs-on: ubuntu-latest
100-
steps:
101-
- uses: actions/checkout@v4
102-
- uses: arduino/setup-task@v2
103-
with:
104-
repo-token: ${{ secrets.GITHUB_TOKEN }}
105-
106-
- run: |
107-
docker network create frontend
108-
task compose -- up --detach
109-
task composer -- install
110-
task coding-standards:php:check
111-
# Check for any changes (task …:check runs task …:apply)
112-
- run: git diff --exit-code
113-
114-
coding-standards-twig:
115-
name: Twig - Check Coding Standards
116-
runs-on: ubuntu-latest
117-
steps:
118-
- uses: actions/checkout@v4
119-
- uses: arduino/setup-task@v2
120-
with:
121-
repo-token: ${{ secrets.GITHUB_TOKEN }}
122-
123-
- run: |
124-
docker network create frontend
125-
task compose -- up --detach
126-
task composer -- install
127-
task coding-standards:twig:check
128-
# Check for any changes (task …:check runs task …:apply)
129-
- run: git diff --exit-code
130-
13132
code-analysis:
13233
name: PHP - Code analysis
13334
runs-on: ubuntu-latest
@@ -161,32 +62,6 @@ jobs:
16162
- name: Check for changes in built css
16263
run: git diff --diff-filter=ACMRT --exit-code web/themes/custom/hoeringsportal/build
16364

164-
install-site:
165-
name: Check that site can be installed
166-
runs-on: ubuntu-latest
167-
steps:
168-
- uses: actions/checkout@v4
169-
170-
- name: Install site
171-
run: |
172-
docker network create frontend
173-
docker compose pull
174-
docker compose up --detach
175-
176-
# Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
177-
docker compose exec phpfpm composer install --no-interaction
178-
179-
# Install the site
180-
docker compose exec phpfpm vendor/bin/drush site:install minimal --existing-config --yes
181-
182-
# Build theme assets
183-
docker compose run --rm node npm install --prefix /app/web/themes/custom/hoeringsportal
184-
docker compose run --rm node npm run build --prefix /app/web/themes/custom/hoeringsportal
185-
186-
- name: Show site URL
187-
run: |
188-
echo $(docker compose exec phpfpm vendor/bin/drush --uri=http://$(docker compose port nginx 8080) user:login)
189-
19065
load-fixtures:
19166
name: Load fixtures
19267
runs-on: ubuntu-latest
@@ -203,7 +78,7 @@ jobs:
20378
docker compose exec phpfpm composer install --no-interaction
20479
20580
# Install the site
206-
docker compose exec phpfpm vendor/bin/drush site:install minimal --existing-config --yes
81+
docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
20782
20883
- name: Load fixtures
20984
run: |
@@ -263,7 +138,7 @@ jobs:
263138
docker compose exec phpfpm composer install --no-interaction
264139
265140
# Install the site
266-
docker compose exec phpfpm vendor/bin/drush site:install minimal --existing-config --yes
141+
docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
267142
268143
# Build theme assets
269144
docker compose run --rm node npm install --prefix /app/web/themes/custom/hoeringsportal
@@ -282,69 +157,6 @@ jobs:
282157
path: playwright-report/
283158
retention-days: 30
284159

285-
update-site:
286-
name: Check that site can be updated
287-
runs-on: ubuntu-latest
288-
steps:
289-
# Install site from our base ref
290-
- uses: actions/checkout@v4
291-
with:
292-
ref: ${{ github.base_ref }}
293-
294-
- name: setup-docker-and-composer
295-
run: |
296-
docker network create frontend
297-
docker compose pull
298-
docker compose --profile pretix up --detach
299-
300-
# Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
301-
docker compose exec phpfpm composer install --no-interaction
302-
303-
- name: Install site
304-
run: |
305-
# Add some local settings.
306-
cat > web/sites/default/settings.local.php <<'EOF'
307-
<?php
308-
309-
$settings['hash_salt'] = '${{ github.head_ref }}';
310-
EOF
311-
312-
cat web/sites/default/settings.local.php
313-
314-
# Install the site from config
315-
docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
316-
317-
- name: Load fixtures (to check that we can update content)
318-
run: |
319-
docker compose exec phpfpm vendor/bin/drush --yes pm:enable hoeringsportal_base_fixtures $(find web/modules/custom -type f -name 'hoeringsportal_*_fixtures.info.yml' -exec basename -s .info.yml {} \;)
320-
docker compose exec phpfpm vendor/bin/drush --yes content-fixtures:load
321-
docker compose exec phpfpm vendor/bin/drush --yes pm:uninstall content_fixtures
322-
323-
- name: Clean up root stuff
324-
run: |
325-
sudo chown -Rv $USER:$USER vendor/ web/ private-files/ || true
326-
sudo chmod -Rv a+w web/sites/default || true
327-
328-
# Install site with our current ref
329-
- uses: actions/checkout@v4
330-
with:
331-
ref: ${{ github.head_ref }}
332-
# Keep our local settings (cf.
333-
# https://github.com/actions/checkout?tab=readme-ov-file#usage)
334-
clean: false
335-
336-
- name: setup-docker-and-composer
337-
run: |
338-
docker compose pull
339-
docker compose up --detach
340-
341-
# Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
342-
docker compose exec phpfpm composer install --no-interaction
343-
344-
- name: Update site
345-
run: |
346-
docker compose exec phpfpm vendor/bin/drush deploy --yes
347-
348160
check-debug-patches:
349161
name: Check that debug patches can be applied and reversed.
350162
runs-on: ubuntu-latest

.github/workflows/site.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ jobs:
6565
if: github.event_name == 'pull_request'
6666
name: Check that site can be updated
6767
runs-on: ubuntu-latest
68+
env:
69+
# Force docker compose to run with the new project name
70+
# @todo Remove in the future when base branch uses the new project name
71+
COMPOSE_PROJECT_NAME: deltag
72+
COMPOSE_DOMAIN: deltag.local.itkdev.dk
6873
steps:
6974
# Install site from our base ref
7075
- uses: actions/checkout@v4

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ignore all Drupal config
2+
config/

.woodpecker/prod.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,57 +21,57 @@ steps:
2121
from_secret: prod_path
2222
user:
2323
from_secret: user
24-
playbook: 'release'
24+
playbook: "release"
2525
pre_up:
2626
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
2727
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes deploy
2828
cron:
2929
cron:
30-
minute: '*/5'
31-
hour: '*'
32-
day: '*'
33-
month: '*'
34-
weekday: '*'
30+
minute: "*/5"
31+
hour: "*"
32+
day: "*"
33+
month: "*"
34+
weekday: "*"
3535
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" core:cron'
3636
hearing-state-update:
37-
minute: '*/1'
38-
hour: '*'
39-
day: '*'
40-
month: '*'
41-
weekday: '*'
37+
minute: "*/1"
38+
hour: "*"
39+
day: "*"
40+
month: "*"
41+
weekday: "*"
4242
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" hoeringsportal:data:hearing-state-update'
4343
public_meeting:
44-
minute: '*/1'
45-
hour: '*'
46-
day: '*'
47-
month: '*'
48-
weekday: '*'
44+
minute: "*/1"
45+
hour: "*"
46+
day: "*"
47+
month: "*"
48+
weekday: "*"
4949
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" hoeringsportal:public_meeting:state-update'
5050
deskpro:
51-
minute: '*/5'
52-
hour: '*'
53-
day: '*'
54-
month: '*'
55-
weekday: '*'
51+
minute: "*/5"
52+
hour: "*"
53+
day: "*"
54+
month: "*"
55+
weekday: "*"
5656
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" advancedqueue:queue:process hoeringsportal_deskpro'
5757
finish-overdue-proposals:
58-
minute: '*/5'
59-
hour: '*'
60-
day: '*'
61-
month: '*'
62-
weekday: '*'
58+
minute: "*/5"
59+
hour: "*"
60+
day: "*"
61+
month: "*"
62+
weekday: "*"
6363
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" hoeringsportal-citizen-proposal:finish-overdue-proposals'
6464
archiving:
65-
minute: '0'
66-
hour: '*'
67-
day: '*'
68-
month: '*'
69-
weekday: '*'
65+
minute: "0"
66+
hour: "*"
67+
day: "*"
68+
month: "*"
69+
weekday: "*"
7070
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" advancedqueue:queue:process hoeringsportal_citizen_proposal_archiving'
7171
delete-replies:
72-
minute: '3'
73-
hour: '*'
74-
day: '*'
75-
month: '*'
76-
weekday: '*'
72+
minute: "3"
73+
hour: "*"
74+
day: "*"
75+
month: "*"
76+
weekday: "*"
7777
job: 'itkdev-docker-compose-server exec phpfpm vendor/bin/drush --uri="https://deltag.aarhus.dk" hoeringsportal:data:delete-replies --yes'

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
99
## [4.11.0] - 2025-07-01
1010

1111
* [PR-526](https://github.com/itk-dev/deltag.aarhus.dk/pull/526)
12-
Updated docker compose setup
12+
* Updated docker compose setup
13+
* Linted YAML
1314
* [PR-523](https://github.com/itk-dev/hoeringsportal/pull/523)
1415
Update public meeting template to use new base-card approach for teasers
1516
* [PR-463](https://github.com/itk-dev/hoeringsportal/pull/463)

0 commit comments

Comments
 (0)