Skip to content

Commit f6db753

Browse files
turegjorupclaude
andcommitted
chore: scope PR down to maintenance contract feature
- Drop asset-mapper migration files (now in PR #81) - Drop duplicate workflows/apispec.yaml (develop has api-spec.yaml) - Consolidate doctrine validation + fixtures into doctrine.yaml, remove duplicates from pr.yaml - Update doctrine.yaml to actions/checkout@v6 and rename job to validate-doctrine-schema - Revert cosmetic changes to .gitignore, .prettierignore, .php-cs-fixer.dist.php, webpack_encore.yaml, .env - Restore psalm.xml and public/css/admin.css (their removal moved to PR #81) - Trim CHANGELOG: drop PR #60 row, fix #90#80 link, keep only feature bullets Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 904b759 commit f6db753

19 files changed

Lines changed: 74 additions & 380 deletions

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ COMPOSE_PROJECT_NAME=itksites
22
COMPOSE_DOMAIN=itksites.local.itkdev.dk
33
ITKDEV_TEMPLATE=symfony-8
44

5-
65
# In all environments, the following files are loaded if they exist,
76
# the latter taking precedence over the former:
87
#

.github/workflows/apispec.yaml

Lines changed: 0 additions & 115 deletions
This file was deleted.

.github/workflows/doctrine.yaml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ on:
1111
- develop
1212

1313
jobs:
14-
coding-standards:
15-
name: Validate Schema
14+
validate-doctrine-schema:
15+
name: Validate Doctrine Schema
1616
runs-on: ubuntu-latest
1717
env:
1818
APP_ENV: prod
1919

2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222

2323
- name: Create docker network
2424
run: |
@@ -39,3 +39,26 @@ jobs:
3939
- name: Validate Doctrine schema
4040
run: |
4141
docker compose run --rm phpfpm bin/console doctrine:schema:validate
42+
43+
load-fixtures:
44+
name: Load Doctrine fixtures
45+
runs-on: ubuntu-latest
46+
47+
steps:
48+
- uses: actions/checkout@v6
49+
50+
- name: Create docker network
51+
run: |
52+
docker network create frontend
53+
54+
- name: Run Composer Install
55+
run: |
56+
docker compose run --rm phpfpm composer install --no-interaction
57+
58+
- name: Run Doctrine Migrations
59+
run: |
60+
docker compose run --rm phpfpm bin/console doctrine:migrations:migrate --no-interaction
61+
62+
- name: Load fixtures
63+
run: |
64+
docker compose run --rm phpfpm composer fixtures

.github/workflows/pr.yaml

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,8 @@
1+
on: pull_request
12
name: Review
23
env:
34
COMPOSE_USER: runner
4-
on: pull_request
5-
65
jobs:
7-
test-suite:
8-
name: Test suite
9-
runs-on: ubuntu-latest
10-
steps:
11-
- uses: actions/checkout@v5
12-
13-
- name: Install Task
14-
uses: go-task/setup-task@v1
15-
16-
- name: Setup docker network
17-
run: |
18-
docker network create frontend
19-
20-
- name: Install Site
21-
run: |
22-
task site:update
23-
task site:migrate
24-
task fixtures:load -y
25-
26-
- name: Test suite
27-
run: |
28-
task test:matrix
29-
30-
- name: Upload coverage to Codecov test
31-
uses: codecov/codecov-action@v5
32-
with:
33-
files: ./coverage/unit.xml
34-
flags: unittests
35-
env:
36-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
37-
38-
validate-doctrine-schema:
39-
runs-on: ubuntu-latest
40-
name: Validate Doctrine Schema
41-
steps:
42-
- name: Checkout
43-
uses: actions/checkout@v6
44-
45-
- name: Create docker network
46-
run: docker network create frontend
47-
48-
- name: Install and validate
49-
run: |
50-
docker compose up --detach
51-
docker compose exec phpfpm composer install --no-interaction
52-
docker compose exec phpfpm bin/console doctrine:migrations:migrate --no-interaction
53-
docker compose exec phpfpm bin/console messenger:setup-transports failed
54-
docker compose exec phpfpm bin/console doctrine:schema:validate
55-
566
phpstan:
577
runs-on: ubuntu-latest
588
name: PHPStan
@@ -95,23 +45,6 @@ jobs:
9545
fail_ci_if_error: true
9646
flags: unittests
9747

98-
fixtures:
99-
runs-on: ubuntu-latest
100-
name: Load fixtures
101-
steps:
102-
- name: Checkout
103-
uses: actions/checkout@v6
104-
105-
- name: Create docker network
106-
run: docker network create frontend
107-
108-
- name: Load fixtures
109-
run: |
110-
docker compose up --detach
111-
docker compose exec phpfpm composer install --no-interaction
112-
docker compose exec phpfpm bin/console doctrine:migrations:migrate --no-interaction
113-
docker compose exec phpfpm composer fixtures
114-
11548
build-assets:
11649
runs-on: ubuntu-latest
11750
name: Build assets

.gitignore

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,5 @@ yarn-error.log
3030
phpstan.neon
3131
###< phpstan/phpstan ###
3232
.phpunit.cache
33-
34-
###> vincentlanglet/twig-cs-fixer ###
35-
/.twig-cs-fixer.cache
36-
###< vincentlanglet/twig-cs-fixer ###
37-
38-
###> symfony/asset-mapper ###
39-
/public/assets/
40-
/assets/vendor/
41-
###< symfony/asset-mapper ###
42-
coverage
43-
4433
.twig-cs-fixer.cache
4534
.playwright-mcp
46-

.php-cs-fixer.dist.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
$finder->in(__DIR__);
1010
// … that are not ignored by VCS
1111
$finder->ignoreVCSIgnored(true);
12-
1312
// Exclude generated files
1413
$finder->notPath('config/reference.php');
1514

.prettierignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# API spec
2-
31
# Generated API specification files
42
public/api-spec-v1.yaml
53
public/api-spec-v1.json
6-

CHANGELOG.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10-
- [#90](https://github.com/itk-dev/devops_itksites/pull/80) 5566: Service agreements
11-
- Remove project entity
12-
- Remove leantime service
10+
- [#80](https://github.com/itk-dev/devops_itksites/pull/80) 5566: Service agreements
1311
- Add security contract entity with crud controller
1412
- Add Abstract full crud controller and extend on it in some cases
1513
- Add economics service and sync action/command for service agreement synchronization
1614

17-
- [#60](https://github.com/itk-dev/devops_itksites/pull/60) 5564: Dependency updates
18-
- Update dependencies
19-
- Update phpunit from 11 to 12
20-
- Update ITK docker template
21-
- Update github actions workflows
22-
2315
## [1.11.0] - 2026-05-19
2416

2517
- [#78](https://github.com/itk-dev/devops_itksites/pull/78)

assets/app.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

assets/styles/app.css

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)