Skip to content

Commit a937bce

Browse files
authored
Merge branch 'develop' into hotfix/1.0.1
2 parents 15e4705 + 616227b commit a937bce

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

.github/workflows/pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
flags: unittests, ${{ matrix.php }}
7979

8080
php-cs-fixer:
81-
runs-on: ubuntu-20.04
81+
runs-on: ubuntu-latest
8282
strategy:
8383
fail-fast: false
8484
matrix:
@@ -167,7 +167,7 @@ jobs:
167167
- name: Yarn install
168168
uses: actions/setup-node@v2
169169
with:
170-
node-version: '18'
170+
node-version: '22'
171171
- run: yarn install
172172
- name: markdownlint
173173
run: yarn run coding-standards-check

CHANGELOG.md

Lines changed: 2 additions & 4 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+
- Updated GitHub workflow images.
12+
1113
## [1.0.1] - 2025-03-12
1214

1315
### Added
@@ -16,10 +18,6 @@ See [keep a changelog] for information about writing changes to this log.
1618
- Add stg Woodpecker workflow
1719
- Add missing license
1820

19-
### Updated
20-
21-
- Updated GitHub workflow images.
22-
2321
## [1.0.0] - 2024-12-13
2422

2523
### Added

docker-compose.server.override.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
# itk-version: 3.2.0
2-
3-
networks:
4-
frontend:
5-
external: true
6-
app:
7-
driver: bridge
8-
internal: false
9-
101
services:
112
phpfpm:
123
environment:
134
- PHP_MEMORY_LIMIT=256M
14-
volumes:
15-
- ../../shared/.env.local:/app/.env.local
165

176
nginx:
187
environment:

docker-compose.server.prod.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
services:
2+
phpfpm:
3+
volumes:
4+
- ../../shared/.env.local:/app/.env.local

0 commit comments

Comments
 (0)