Skip to content

Commit bb9ca5b

Browse files
committed
Merge branch 'release/1.7.1'
2 parents b17c40d + 73b5a77 commit bb9ca5b

File tree

4 files changed

+39
-29
lines changed

4 files changed

+39
-29
lines changed

.github/workflows/pr.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0
2020

2121
test-composer-install:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-latest
2323
strategy:
2424
fail-fast: false
2525
matrix:
@@ -38,7 +38,7 @@ jobs:
3838
id: composer-cache
3939
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
4040
- name: Cache composer dependencies
41-
uses: actions/cache@v2
41+
uses: actions/cache@v4
4242
with:
4343
path: ${{ steps.composer-cache.outputs.dir }}
4444
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -51,7 +51,7 @@ jobs:
5151
APP_ENV=prod composer install --no-dev -o
5252
5353
unit_tests:
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-latest
5555
strategy:
5656
fail-fast: false
5757
matrix:
@@ -70,7 +70,7 @@ jobs:
7070
id: composer-cache
7171
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
7272
- name: Cache composer dependencies
73-
uses: actions/cache@v2
73+
uses: actions/cache@v4
7474
with:
7575
path: ${{ steps.composer-cache.outputs.dir }}
7676
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -81,7 +81,7 @@ jobs:
8181
run: ./bin/phpunit --coverage-clover=coverage/unit.xml
8282

8383
# end-to-end-tests:
84-
# runs-on: ubuntu-20.04
84+
# runs-on: ubuntu-latest
8585
# env:
8686
# DATABASE_URL: mysql://db:db@127.0.0.1:3306/db?serverVersion=mariadb-10.3.17&charset=utf8mb4
8787
# services:
@@ -113,7 +113,7 @@ jobs:
113113
# id: composer-cache
114114
# run: echo "::set-output name=dir::$(composer config cache-files-dir)"
115115
# - name: Cache composer dependencies
116-
# uses: actions/cache@v2
116+
# uses: actions/cache@v4
117117
# with:
118118
# path: ${{ steps.composer-cache.outputs.dir }}
119119
# key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -127,7 +127,7 @@ jobs:
127127
# - name: Yarn install
128128
# uses: actions/setup-node@v2
129129
# with:
130-
# node-version: '14'
130+
# node-version: '22'
131131
# - run: yarn install
132132
# - name: Yarn build
133133
# run: yarn run encore production
@@ -150,7 +150,7 @@ jobs:
150150
# CYPRESS_baseUrl: http://127.0.0.1:8000
151151

152152
php-cs-fixer:
153-
runs-on: ubuntu-20.04
153+
runs-on: ubuntu-latest
154154
strategy:
155155
fail-fast: false
156156
matrix:
@@ -169,7 +169,7 @@ jobs:
169169
id: composer-cache
170170
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
171171
- name: Cache composer dependencies
172-
uses: actions/cache@v2
172+
uses: actions/cache@v4
173173
with:
174174
path: ${{ steps.composer-cache.outputs.dir }}
175175
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -180,7 +180,7 @@ jobs:
180180
run: phpdbg -qrr ./vendor/bin/php-cs-fixer fix --dry-run
181181

182182
twigcs:
183-
runs-on: ubuntu-20.04
183+
runs-on: ubuntu-latest
184184
strategy:
185185
fail-fast: false
186186
matrix:
@@ -199,7 +199,7 @@ jobs:
199199
id: composer-cache
200200
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
201201
- name: Cache composer dependencies
202-
uses: actions/cache@v2
202+
uses: actions/cache@v4
203203
with:
204204
path: ${{ steps.composer-cache.outputs.dir }}
205205
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -210,7 +210,7 @@ jobs:
210210
run: phpdbg -qrr ./vendor/bin/twigcs templates
211211

212212
javascript-standard-style:
213-
runs-on: ubuntu-20.04
213+
runs-on: ubuntu-latest
214214
name: JavaScript Standard Style
215215
steps:
216216
- name: Checkout
@@ -219,7 +219,7 @@ jobs:
219219
id: yarn-cache-dir-path
220220
run: echo "::set-output name=dir::$(yarn cache dir)"
221221
- name: Cache yarn packages
222-
uses: actions/cache@v2
222+
uses: actions/cache@v4
223223
id: yarn-cache
224224
with:
225225
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -229,13 +229,13 @@ jobs:
229229
- name: Yarn install
230230
uses: actions/setup-node@v2
231231
with:
232-
node-version: '16'
232+
node-version: '22'
233233
- run: yarn install
234234
- name: javascript-standard-style
235235
run: yarn coding-standards-check/standard
236236

237237
markdownlint:
238-
runs-on: ubuntu-20.04
238+
runs-on: ubuntu-latest
239239
name: markdownlint
240240
steps:
241241
- name: Checkout
@@ -244,7 +244,7 @@ jobs:
244244
id: yarn-cache-dir-path
245245
run: echo "::set-output name=dir::$(yarn cache dir)"
246246
- name: Cache yarn packages
247-
uses: actions/cache@v2
247+
uses: actions/cache@v4
248248
id: yarn-cache
249249
with:
250250
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -254,13 +254,13 @@ jobs:
254254
- name: Yarn install
255255
uses: actions/setup-node@v2
256256
with:
257-
node-version: '16'
257+
node-version: '22'
258258
- run: yarn install
259259
- name: markdownlint
260260
run: yarn coding-standards-check/markdownlint
261261

262262
translations:
263-
runs-on: ubuntu-20.04
263+
runs-on: ubuntu-latest
264264
strategy:
265265
fail-fast: false
266266
matrix:

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ on:
66
name: Create Release
77
jobs:
88
create-release:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010
env:
1111
REPO_NAME: ${{ github.event.repository.name }}
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
php: [ '8.1' ]
16-
node: [ '14' ]
15+
php: [ '8.3' ]
16+
node: [ '22' ]
1717
name: Create Release
1818
steps:
1919
- name: Checkout

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ about writing changes to this log.
1010

1111
## [Unreleased]
1212

13+
## [1.7.1] - 2025-05-28
14+
15+
- [PR-410](https://github.com/itk-dev/naevnssekretariatet/pull/410)
16+
- Updates to latest `itk-dev/serviceplatformen` to ensure latest endpoints
17+
are used when fetching SAML-token.
18+
- Updates GitHub Actions.
19+
- [PR-409](https://github.com/itk-dev/naevnssekretariatet/pull/409)
20+
Updated GitHub workflow images
21+
1322
## [1.7.0] - 2025-01-20
1423

1524
- [PR-407](https://github.com/itk-dev/naevnssekretariatet/pull/407)
@@ -359,6 +368,7 @@ Fixed error in unescaped characters in filename
359368
Resolved issue regarding time formats.
360369

361370
[Unreleased]: https://github.com/itk-dev/naevnssekretariatet/compare/1.7.0...HEAD
371+
[1.7.1]: https://github.com/itk-dev/naevnssekretariatet/compare/1.7.0...1.7.1
362372
[1.7.0]: https://github.com/itk-dev/naevnssekretariatet/compare/1.6.2...1.7.0
363373
[1.6.2]: https://github.com/itk-dev/naevnssekretariatet/compare/1.6.1...1.6.2
364374
[1.6.1]: https://github.com/itk-dev/naevnssekretariatet/compare/1.6.0...1.6.1

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)