Skip to content

Commit

Permalink
Merge pull request #228 from TriliumNext/feature/update_to_node20
Browse files Browse the repository at this point in the history
Update Node.js version
  • Loading branch information
eliandoran authored Jul 20, 2024
2 parents 05776d1 + 9b9180e commit 645c16e
Show file tree
Hide file tree
Showing 7 changed files with 391 additions and 327 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Dev
on:
push:
branches:
- '!develop'
- '!feature/update*'
jobs:
build_docker:
name: Build Docker image
Expand All @@ -10,7 +13,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- name: Run the TypeScript build
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- 'develop'
- 'feature/update*'
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
Expand All @@ -15,7 +16,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- run: ./bin/build-mac-x64.sh
Expand All @@ -31,7 +32,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- run: ./bin/build-mac-arm64.sh
Expand All @@ -47,7 +48,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- run: ./bin/build-linux-x64.sh
Expand All @@ -67,7 +68,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- run: ./bin/build-server.sh
Expand All @@ -90,7 +91,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- run: ./bin/build-win-x64.sh
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
- name: Set up node & dependencies
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
- run: npm ci
- name: Run the TypeScript build
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image:
file: .gitpod.dockerfile

tasks:
- before: nvm install 18.18.2 && nvm use 18.18.2
- before: nvm install 20.15.1 && nvm use 20.15.1
init: npm install
command: npm run start-server

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

# Configure system dependencies
RUN apk add --no-cache --virtual .build-dependencies \
Expand Down
2 changes: 1 addition & 1 deletion bin/build-server.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=18.18.2
NODE_VERSION=20.15.1

if [ "$1" != "DONTCOPY" ]
then
Expand Down
Loading

0 comments on commit 645c16e

Please sign in to comment.