Skip to content

Commit 29d3e73

Browse files
committed
Bump node to v20 and update workflows to start a new branch
1 parent a59cf05 commit 29d3e73

File tree

4 files changed

+35
-30
lines changed

4 files changed

+35
-30
lines changed

.github/workflows/build-release.yml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Build assets for SimpleSAMLphp 2.4
2+
name: Build assets for SimpleSAMLphp 2.5
33

44
on: # yamllint disable-line rule:truthy
55
push:
@@ -9,13 +9,16 @@ on: # yamllint disable-line rule:truthy
99
workflow_dispatch:
1010

1111
jobs:
12-
quality:
13-
name: Quality checks
12+
pre-quality-cleanup:
13+
name: 'Cleanup Code Base'
1414
runs-on: ['ubuntu-latest']
1515
if: ${{ github.event.commits[0].author.name != 'dependabot[bot]' }}
1616

17+
strategy:
18+
fail-fast: false
19+
1720
steps:
18-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
1922
with:
2023
token: ${{ secrets.ASSETS_COMMIT_TOKEN }}
2124
ref: ${{ github.head_ref || github.ref_name }}
@@ -30,25 +33,27 @@ jobs:
3033
# Remove generated files; we can't lint them and we want to detect removed files during build
3134
run: find css/ webfonts/ icons/ js/ -type f -not -name '.gitkeep' -delete
3235

33-
- name: Lint Code Base
34-
uses: super-linter/super-linter/slim@v8
35-
env:
36-
DEFAULT_BRANCH: ${{ github.head_ref || github.ref_name }}
37-
# CSS Linter will choke on generated assets
38-
IGNORE_GENERATED_FILES: true
39-
FILTER_REGEX_EXCLUDE: '(css|js|webfonts|icons)/.*'
40-
# To report GitHub Actions status checks
41-
SAVE_SUPER_LINTER_OUTPUT: false
42-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43-
LINTER_RULES_PATH: 'tools/linters'
44-
VALIDATE_ALL_CODEBASE: true
45-
VALIDATE_CSS: true
46-
VALIDATE_JAVASCRIPT_ES: true
47-
VALIDATE_JSON: true
48-
VALIDATE_MARKDOWN: true
49-
VALIDATE_YAML: true
50-
VALIDATE_GITHUB_ACTIONS: true
36+
quality:
37+
name: 'Lint Code Base'
38+
strategy:
39+
fail-fast: false
40+
41+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.0
42+
with:
43+
enable_eslinter: true
44+
enable_jsonlinter: true
45+
enable_stylelinter: true
46+
enable_yamllinter: true
47+
48+
post-quality-wrapup:
49+
name: 'Save cleaned and quality-checked Code Base'
50+
runs-on: ['ubuntu-latest']
51+
needs: post-quality-wrapup
52+
53+
strategy:
54+
fail-fast: false
5155

56+
steps:
5257
- name: Zip artifact for deployment
5358
run: |
5459
zip release.zip -r .
@@ -62,15 +67,15 @@ jobs:
6267
build:
6368
name: Build assets
6469
runs-on: ['ubuntu-latest']
65-
needs: quality
70+
needs: post-quality-wrapup
6671

6772
outputs:
6873
files_changed: ${{ steps.changes.outputs.files_changed }}
6974

7075
steps:
7176
- uses: actions/setup-node@v4
7277
with:
73-
node-version: 18
78+
node-version: 20
7479

7580
- uses: actions/download-artifact@v5
7681
with:

.github/workflows/update-dependencies.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Update dependencies for SimpleSAMLphp 2.4
2+
name: Update dependencies for SimpleSAMLphp 2.5
33

44
on: workflow_dispatch
55

@@ -13,7 +13,7 @@ jobs:
1313
packages_changed: ${{ steps.changes.outputs.packages_changed }}
1414

1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
with:
1818
token: ${{ secrets.ASSETS_COMMIT_TOKEN }}
1919
ref: ${{ github.head_ref || github.ref_name }}
@@ -25,7 +25,7 @@ jobs:
2525
run: git fetch --all
2626
- uses: actions/setup-node@v4
2727
with:
28-
node-version: 18
28+
node-version: 20
2929

3030
- name: Install & build assets
3131
run: |

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.1",
13+
"php": "^8.2",
1414

15-
"simplesamlphp/composer-module-installer": "^1.3.4"
15+
"simplesamlphp/composer-module-installer": "^1.4.0"
1616
},
1717
"archive": {
1818
"exclude": [

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "tvdijen",
66
"license": "LGPL-2.1-or-later",
77
"engines": {
8-
"node": ">=18.0.0",
8+
"node": ">=20.0.0",
99
"npm": ">=8.0.0"
1010
},
1111
"scripts": {

0 commit comments

Comments
 (0)