Skip to content

Commit 5e14c79

Browse files
rimi-itkrimi-itk
authored
Merge pull request #30 from itk-dev/feature/4120-upgrade-3.0.0
4120: Upgraded stuff
2 parents 61b0fb9 + 2a4efc3 commit 5e14c79

70 files changed

Lines changed: 1465 additions & 1114 deletions

Some content is hidden

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

‎.github/workflows/changelog.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Do not edit this file! Make a pull request on changing
2+
# github/workflows/changelog.yaml in
3+
# https://github.com/itk-dev/devops_itkdev-docker if need be.
4+
5+
### ## Changelog
6+
###
7+
### Checks that changelog has been updated
8+
9+
name: Changelog
10+
11+
on:
12+
pull_request:
13+
14+
jobs:
15+
changelog:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 2
24+
25+
- name: Git fetch
26+
run: git fetch
27+
28+
- name: Check that changelog has been updated.
29+
run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0

‎.github/workflows/composer.yaml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Do not edit this file! Make a pull request on changing
2+
# github/workflows/composer.yaml in
3+
# https://github.com/itk-dev/devops_itkdev-docker if need be.
4+
5+
### ## Composer
6+
###
7+
### Validates composer.json and checks that it's normalized.
8+
###
9+
### ### Assumptions
10+
###
11+
### 1. A docker compose service named `phpfpm` can be run and `composer` can be
12+
### run inside the `phpfpm` service.
13+
### 2. [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize)
14+
### is a dev requirement in `composer.json`:
15+
###
16+
### ``` shell
17+
### docker compose run --rm phpfpm composer require --dev ergebnis/composer-normalize
18+
### ```
19+
###
20+
### Normalize `composer.json` by running
21+
###
22+
### ``` shell
23+
### docker compose run --rm phpfpm composer normalize
24+
### ```
25+
26+
name: Composer
27+
28+
env:
29+
COMPOSE_USER: root
30+
31+
on:
32+
pull_request:
33+
push:
34+
35+
jobs:
36+
composer-validate:
37+
runs-on: ubuntu-latest
38+
strategy:
39+
fail-fast: false
40+
steps:
41+
- uses: actions/checkout@v4
42+
- run: |
43+
docker network create frontend
44+
docker compose run --rm phpfpm composer validate --strict
45+
46+
composer-normalized:
47+
runs-on: ubuntu-latest
48+
strategy:
49+
fail-fast: false
50+
steps:
51+
- uses: actions/checkout@v4
52+
- run: |
53+
docker network create frontend
54+
docker compose run --rm phpfpm composer install
55+
docker compose run --rm phpfpm composer normalize --dry-run
56+
57+
composer-audit:
58+
runs-on: ubuntu-latest
59+
strategy:
60+
fail-fast: false
61+
steps:
62+
- uses: actions/checkout@v4
63+
- run: |
64+
docker network create frontend
65+
docker compose run --rm phpfpm composer audit

‎.github/workflows/markdown.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Do not edit this file! Make a pull request on changing
2+
# github/workflows/markdown.yaml in
3+
# https://github.com/itk-dev/devops_itkdev-docker if need be.
4+
5+
### ## Markdown
6+
###
7+
### Uses [itkdev/markdownlint](https://hub.docker.com/r/itkdev/markdownlint) to
8+
### link all Markdown files (`**/*.md`) in the project.
9+
###
10+
### [markdownlint-cli configuration ### files](https://github.com/igorshubovych/markdownlint-cli?tab=readme-ov-file#configuration),
11+
### `.markdownlint.jsonc` and `.markdownlintignore` control what is actually linted and how.
12+
13+
name: Markdown
14+
15+
on:
16+
pull_request:
17+
push:
18+
19+
jobs:
20+
markdown-lint:
21+
runs-on: ubuntu-latest
22+
strategy:
23+
fail-fast: false
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
28+
- run: |
29+
docker run --rm --volume "$PWD":/md itkdev/markdownlint '**/*.md'

‎.github/workflows/pr.yaml‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -146,43 +146,3 @@ jobs:
146146
bin/console cache:clear
147147
- name: Psalm
148148
run: composer run coding-standards-analysis
149-
150-
markdownlint:
151-
name: Markdown Lint
152-
runs-on: ubuntu-24.04
153-
steps:
154-
- name: Checkout
155-
uses: actions/checkout@v4
156-
- name: Get yarn cache directory path
157-
id: yarn-cache-dir-path
158-
run: echo "::set-output name=dir::$(yarn cache dir)"
159-
- name: Cache yarn packages
160-
uses: actions/cache@v4
161-
id: yarn-cache
162-
with:
163-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
164-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
165-
restore-keys: |
166-
${{ runner.os }}-yarn-
167-
- name: Yarn install
168-
uses: actions/setup-node@v2
169-
with:
170-
node-version: '18'
171-
- run: yarn install
172-
- name: markdownlint
173-
run: yarn run coding-standards-check
174-
175-
changelog:
176-
runs-on: ubuntu-24.04
177-
name: Changelog should be updated
178-
steps:
179-
- name: Checkout
180-
uses: actions/checkout@v4
181-
with:
182-
fetch-depth: 2
183-
184-
- name: Git fetch
185-
run: git fetch
186-
187-
- name: Check that changelog has been updated.
188-
run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ phpstan.neon
3939

4040
### phpactor ###
4141
/.phpactor.json
42+
###> vincentlanglet/twig-cs-fixer ###
43+
/.twig-cs-fixer.cache
44+
###< vincentlanglet/twig-cs-fixer ###

‎.markdownlint.json‎

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

‎.markdownlint.jsonc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// markdownlint-cli configuration file (cf. https://github.com/igorshubovych/markdownlint-cli?tab=readme-ov-file#configuration)
2+
{
3+
"default": true,
4+
// https://github.com/DavidAnson/markdownlint/blob/main/doc/md013.md
5+
"line-length": {
6+
"line_length": 120,
7+
"code_blocks": false,
8+
"tables": false
9+
},
10+
// https://github.com/DavidAnson/markdownlint/blob/main/doc/md024.md
11+
"no-duplicate-heading": {
12+
"siblings_only": true
13+
},
14+
// https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections#creating-a-collapsed-section
15+
// https://github.com/DavidAnson/markdownlint/blob/main/doc/md033.md
16+
"no-inline-html": {
17+
"allowed_elements": ["details", "summary"]
18+
}
19+
}

‎.markdownlintignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# https://github.com/igorshubovych/markdownlint-cli?tab=readme-ov-file#ignoring-files
2+
vendor/
3+
node_modules/
4+
LICENSE.md
5+
# Drupal
6+
web/*.md
7+
web/core/
8+
web/*/contrib/

‎.woodpecker/stg.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ steps:
2727
- git fetch origin ${CI_COMMIT_BRANCH}
2828
- git checkout ${CI_COMMIT_BRANCH}
2929
- git pull
30-
- itkdev-docker-compose-server up -d --force-recreate
31-
- itkdev-docker-compose-server exec phpfpm composer install
30+
- itkdev-docker-compose-server up --detach --force-recreate
31+
- itkdev-docker-compose-server exec phpfpm composer install --no-dev --classmap-authoritative
32+
# https://symfony.com/doc/current/frontend/asset_mapper.html#serving-assets-in-dev-vs-prod
33+
- itkdev-docker-compose-server exec phpfpm bin/console asset-map:compile
3234
- itkdev-docker-compose-server exec phpfpm bin/console cache:clear

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ See [keep a changelog] for information about writing changes to this log.
88

99
## [Unreleased]
1010

11+
* [PR-30](https://github.com/itk-dev/sysstatus/pull/30)
12+
Upgraded and cleaned up
1113
* Login and dashboard styling cleanup
1214
* Added github actions.
1315
* Added PHPStan.

0 commit comments

Comments
 (0)