Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 645c16e

Browse files
authored
Merge pull request #228 from TriliumNext/feature/update_to_node20
Update Node.js version
2 parents 05776d1 + 9b9180e commit 645c16e

File tree

7 files changed

+391
-327
lines changed

7 files changed

+391
-327
lines changed

.github/workflows/dev.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Dev
22
on:
33
push:
4+
branches:
5+
- '!develop'
6+
- '!feature/update*'
47
jobs:
58
build_docker:
69
name: Build Docker image
@@ -10,7 +13,7 @@ jobs:
1013
- name: Set up node & dependencies
1114
uses: actions/setup-node@v4
1215
with:
13-
node-version: 18
16+
node-version: 20
1417
cache: "npm"
1518
- run: npm ci
1619
- name: Run the TypeScript build

.github/workflows/main.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- 'develop'
6+
- 'feature/update*'
67
env:
78
REGISTRY: ghcr.io
89
IMAGE_NAME: ${{ github.repository }}
@@ -15,7 +16,7 @@ jobs:
1516
- name: Set up node & dependencies
1617
uses: actions/setup-node@v4
1718
with:
18-
node-version: 18
19+
node-version: 20
1920
cache: "npm"
2021
- run: npm ci
2122
- run: ./bin/build-mac-x64.sh
@@ -31,7 +32,7 @@ jobs:
3132
- name: Set up node & dependencies
3233
uses: actions/setup-node@v4
3334
with:
34-
node-version: 18
35+
node-version: 20
3536
cache: "npm"
3637
- run: npm ci
3738
- run: ./bin/build-mac-arm64.sh
@@ -47,7 +48,7 @@ jobs:
4748
- name: Set up node & dependencies
4849
uses: actions/setup-node@v4
4950
with:
50-
node-version: 18
51+
node-version: 20
5152
cache: "npm"
5253
- run: npm ci
5354
- run: ./bin/build-linux-x64.sh
@@ -67,7 +68,7 @@ jobs:
6768
- name: Set up node & dependencies
6869
uses: actions/setup-node@v4
6970
with:
70-
node-version: 18
71+
node-version: 20
7172
cache: "npm"
7273
- run: npm ci
7374
- run: ./bin/build-server.sh
@@ -90,7 +91,7 @@ jobs:
9091
- name: Set up node & dependencies
9192
uses: actions/setup-node@v4
9293
with:
93-
node-version: 18
94+
node-version: 20
9495
cache: "npm"
9596
- run: npm ci
9697
- run: ./bin/build-win-x64.sh
@@ -122,7 +123,7 @@ jobs:
122123
- name: Set up node & dependencies
123124
uses: actions/setup-node@v4
124125
with:
125-
node-version: 18
126+
node-version: 20
126127
cache: "npm"
127128
- run: npm ci
128129
- name: Run the TypeScript build

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ image:
22
file: .gitpod.dockerfile
33

44
tasks:
5-
- before: nvm install 18.18.2 && nvm use 18.18.2
5+
- before: nvm install 20.15.1 && nvm use 20.15.1
66
init: npm install
77
command: npm run start-server
88

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
2-
FROM node:18.18.2-alpine
2+
FROM node:20.15.1-alpine
33

44
# Configure system dependencies
55
RUN apk add --no-cache --virtual .build-dependencies \

bin/build-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
PKG_DIR=dist/trilium-linux-x64-server
4-
NODE_VERSION=18.18.2
4+
NODE_VERSION=20.15.1
55

66
if [ "$1" != "DONTCOPY" ]
77
then

0 commit comments

Comments
 (0)