Skip to content

Commit 90110f8

Browse files
authored
Merge branch 'develop' into v24
2 parents 56432a8 + a5b85c4 commit 90110f8

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/automated-tests.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: "Use Node.js"
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: 23
25+
node-version: lts/*
2626
cache: "npm"
2727
- name: "Install dependencies"
2828
run: |
@@ -55,13 +55,15 @@ jobs:
5555
- name: "Install MagicMirror²"
5656
run: |
5757
node --run install-mm:dev
58-
- name: "Run tests"
58+
- name: "Prepare environment for tests"
5959
run: |
6060
# Fix chrome-sandbox permissions:
6161
sudo chown root:root ./node_modules/electron/dist/chrome-sandbox
6262
sudo chmod 4755 ./node_modules/electron/dist/chrome-sandbox
6363
# Start labwc
6464
WLR_BACKENDS=headless WLR_LIBINPUT_NO_DEVICES=1 WLR_RENDERER=pixman labwc &
65-
export WAYLAND_DISPLAY=wayland-0
6665
touch css/custom.css
66+
- name: "Run tests"
67+
run: |
68+
export WAYLAND_DISPLAY=wayland-0
6769
node --run test

.github/workflows/spellcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Node.js
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: "22"
24+
node-version: lts/*
2525
check-latest: true
2626
cache: "npm"
2727
- name: Install dependencies

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ planned for 2025-07-01
1818
### Changed
1919

2020
- [refactor] Simplify module loading process (#3766)
21-
- Use "node --run" instead of "npm run" (#1511)
22-
- [workflow] Replace Node.js version v23 with v24
21+
- Use "node --run" instead of "npm run" (#3764)
22+
- [workflow] Run linter und spellcheck with LTS node version (#3767)
23+
- [workflow] Split "Run test" step into two steps for more clarity (#3767)
24+
- [workflow] Replace Node.js version v23 with v24 (#3770)
2325

2426
## [2.31.0] - 2025-04-01
2527

0 commit comments

Comments
 (0)