Skip to content

Commit c1606f3

Browse files
committed
Build new 2.5-branch
1 parent b3f6cd5 commit c1606f3

File tree

3 files changed

+19
-55
lines changed

3 files changed

+19
-55
lines changed

.github/workflows/build-release.yml

Lines changed: 11 additions & 47 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:
@@ -10,54 +10,18 @@ on: # yamllint disable-line rule:truthy
1010

1111
jobs:
1212
quality:
13-
name: Quality checks
14-
runs-on: ['ubuntu-latest']
13+
name: 'Lint Code Base'
1514
if: ${{ github.event.commits[0].author.name != 'dependabot[bot]' }}
1615

17-
steps:
18-
- uses: actions/checkout@v5
19-
with:
20-
token: ${{ secrets.ASSETS_COMMIT_TOKEN }}
21-
ref: ${{ github.head_ref || github.ref_name }}
22-
# Full git history is needed to get a proper list of changed files within `super-linter`
23-
fetch-depth: 0
24-
25-
- name: Fetch changes
26-
# Without fetching, we might miss new tags due to caching in Github Actions
27-
run: git fetch --all
28-
29-
- name: Remove generated files
30-
# Remove generated files; we can't lint them and we want to detect removed files during build
31-
run: find css/ js/ -type f -not -name '.gitkeep' -delete
32-
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)/.*'
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
51-
52-
- name: Zip artifact for deployment
53-
run: |
54-
zip release.zip -r .
16+
strategy:
17+
fail-fast: false
5518

56-
- uses: actions/upload-artifact@v4
57-
with:
58-
name: release
59-
path: release.zip
60-
retention-days: 1
19+
uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.10.0
20+
with:
21+
enable_eslinter: true
22+
enable_jsonlinter: true
23+
enable_stylelinter: true
24+
enable_yamllinter: true
6125

6226
build:
6327
name: Build assets
@@ -70,7 +34,7 @@ jobs:
7034
steps:
7135
- uses: actions/setup-node@v4
7236
with:
73-
node-version: 18
37+
node-version: 20
7438

7539
- uses: actions/download-artifact@v5
7640
with:

.github/workflows/update-dependencies.yml

Lines changed: 2 additions & 2 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

@@ -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: |

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "tvdijen",
55
"license": "LGPL-2.1-or-later",
66
"engines": {
7-
"node": ">=18.0.0",
7+
"node": ">=20.0.0",
88
"npm": ">=8.0.0"
99
},
1010
"scripts": {
@@ -14,12 +14,12 @@
1414
"[module-name]": false
1515
},
1616
"dependencies": {
17-
"jquery": "^3.7",
18-
"jquery-ui": "^1.14"
17+
"jquery": "^3.7.1",
18+
"jquery-ui": "^1.14.1"
1919
},
2020
"devDependencies": {
21-
"copy-webpack-plugin": "^12.0.2",
22-
"webpack": "^5.101.2",
23-
"webpack-cli": "^5.1.4"
21+
"copy-webpack-plugin": "^13.0.1",
22+
"webpack": "^5.101.3",
23+
"webpack-cli": "^6.0.1"
2424
}
2525
}

0 commit comments

Comments
 (0)