Skip to content

Commit 4b53ce9

Browse files
committed
5282: Updated project template
1 parent 46fb7ad commit 4b53ce9

File tree

7 files changed

+51
-14
lines changed

7 files changed

+51
-14
lines changed

.editorconfig

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1+
# This file is copied from config/symfony/.editorconfig in https://github.com/itk-dev/devops_itkdev-docker.
2+
# Feel free to edit the file, but consider making a pull request if you find a general issue with the file.
3+
14
# EditorConfig is awesome: https://editorconfig.org
25

36
# top-most EditorConfig file
47
root = true
58

69
[*]
7-
end_of_line = lf
8-
insert_final_newline = true
910
charset = utf-8
10-
indent_style = space
11+
end_of_line = LF
1112
indent_size = 4
13+
indent_style = space
14+
insert_final_newline = true
15+
trim_trailing_whitespace = true
16+
17+
[*.{js,css,scss}]
18+
indent_size = 2
1219

1320
[*.{yml,yaml}]
1421
indent_size = 2
1522

16-
# Symfony uses 4 spaces for indent
1723
[config/**/*.{yml,yaml}]
1824
indent_size = 4

.github/workflows/composer.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ jobs:
4242
fail-fast: false
4343
steps:
4444
- uses: actions/checkout@v4
45-
- run: |
45+
46+
- name: Create docker network
47+
run: |
4648
docker network create frontend
49+
50+
- run: |
4751
docker compose run --rm phpfpm composer validate --strict
4852
4953
composer-normalized:
@@ -52,8 +56,12 @@ jobs:
5256
fail-fast: false
5357
steps:
5458
- uses: actions/checkout@v4
55-
- run: |
59+
60+
- name: Create docker network
61+
run: |
5662
docker network create frontend
63+
64+
- run: |
5765
docker compose run --rm phpfpm composer install
5866
docker compose run --rm phpfpm composer normalize --dry-run
5967
@@ -63,6 +71,10 @@ jobs:
6371
fail-fast: false
6472
steps:
6573
- uses: actions/checkout@v4
66-
- run: |
74+
75+
- name: Create docker network
76+
run: |
6777
docker network create frontend
78+
79+
- run: |
6880
docker compose run --rm phpfpm composer audit

.github/workflows/markdown.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
- name: Checkout
3737
uses: actions/checkout@v4
3838

39-
- run: |
39+
- name: Create docker network
40+
run: |
4041
docker network create frontend
4142
4243
- run: |

.github/workflows/php.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- uses: actions/checkout@v4
52-
- run: |
52+
53+
- name: Create docker network
54+
run: |
5355
docker network create frontend
56+
57+
- run: |
5458
docker compose run --rm phpfpm composer install
5559
# https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/usage.rst#the-check-command
5660
docker compose run --rm phpfpm vendor/bin/php-cs-fixer fix --dry-run --diff

.github/workflows/twig.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ jobs:
4242
- name: Checkout
4343
uses: actions/checkout@v4
4444

45-
- run: |
45+
- name: Create docker network
46+
run: |
4647
docker network create frontend
48+
49+
- run: |
4750
docker compose run --rm phpfpm composer install
4851
docker compose run --rm phpfpm vendor/bin/twig-cs-fixer lint

.github/workflows/yaml.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# Do not edit this file! Make a pull request on changing
2-
# github/workflows/symfony/yaml.yaml in
2+
# github/workflows/yaml.yaml in
33
# https://github.com/itk-dev/devops_itkdev-docker if need be.
44

5-
### ### Symfony YAML
5+
### ### YAML
66
###
7-
### Validates Symfony YAML files.
7+
### Validates YAML files.
88
###
99
### #### Assumptions
1010
###
1111
### 1. A docker compose service named `prettier` for running
1212
### [Prettier](https://prettier.io/) exists.
13+
###
14+
### #### Symfony YAML
15+
###
16+
### Symfony's YAML config files use 4 spaces for indentation and single quotes.
17+
### Therefore we use a [Prettier configuration
18+
### file](https://prettier.io/docs/configuration), `.prettierrc.yaml`, to make
19+
### Prettier format YAML files in the `config/` folder like Symfony expects.
1320

1421
name: YAML
1522

@@ -26,7 +33,8 @@ jobs:
2633
steps:
2734
- uses: actions/checkout@v4
2835

29-
- run: |
36+
- name: Create docker network
37+
run: |
3038
docker network create frontend
3139
3240
- run: |

.prettierrc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file is copied from config/symfony/yaml/.prettierrc.yaml in https://github.com/itk-dev/devops_itkdev-docker.
2+
# Feel free to edit the file, but consider making a pull request if you find a general issue with the file.
3+
14
# https://prettier.io/docs/configuration
25
overrides:
36
# Symfony config

0 commit comments

Comments
 (0)