chore(nx/forge): work on server packaging

This commit is contained in:
Elian Doran 2025-04-27 12:22:10 +03:00
parent 1a92e489d9
commit 3bdd13fa44
No known key found for this signature in database
4 changed files with 9 additions and 18 deletions

View File

@ -22,8 +22,8 @@ runs:
MATRIX_ARCH: ${{ inputs.arch }} MATRIX_ARCH: ${{ inputs.arch }}
shell: bash shell: bash
run: | run: |
npm run chore:update-build-info pnpm run chore:update-build-info
npm run server:package pnpm nx --project=@triliumnext/server package
- name: Prepare artifacts - name: Prepare artifacts
shell: bash shell: bash
run: | run: |

View File

@ -27,7 +27,6 @@
"start": "cross-env nodemon src/main.ts", "start": "cross-env nodemon src/main.ts",
"test": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./spec/data TRILIUM_INTEGRATION_TEST=memory vitest", "test": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./spec/data TRILIUM_INTEGRATION_TEST=memory vitest",
"coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./spec/data TRILIUM_INTEGRATION_TEST=memory vitest --coverage", "coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./spec/data TRILIUM_INTEGRATION_TEST=memory vitest --coverage",
"package": "bash ./scripts/build-server.sh"
}, },
"dependencies": { "dependencies": {

View File

@ -146,6 +146,10 @@
} }
} }
}, },
"package": {
"dependsOn": [ "^build" ],
"command": "bash apps/server/scripts/build-server.sh"
},
"docker-build": { "docker-build": {
"dependsOn": [ "dependsOn": [
"build" "build"

View File

@ -23,17 +23,9 @@ echo "Selected Arch: $ARCH"
# Set Node.js version and architecture-specific filename # Set Node.js version and architecture-specific filename
NODE_VERSION=22.14.0 NODE_VERSION=22.14.0
BUILD_DIR="./build" script_dir=$(realpath $(dirname $0))
DIST_DIR="./dist" BUILD_DIR="$script_dir/../dist"
CLEANUP_SCRIPT="./scripts/cleanupNodeModules.ts" DIST_DIR="$script_dir/../out"
# Trigger the build
echo "Build start"
npm run build:prepare-dist
echo "Build finished"
# pruning of unnecessary files and devDeps in node_modules
node --experimental-strip-types $CLEANUP_SCRIPT $BUILD_DIR
NODE_FILENAME=node-v${NODE_VERSION}-linux-${ARCH} NODE_FILENAME=node-v${NODE_VERSION}-linux-${ARCH}
@ -54,12 +46,8 @@ rm -rf $BUILD_DIR/node/lib/node_modules/{npm,corepack} \
printf "#!/bin/sh\n./node/bin/node src/main\n" > $BUILD_DIR/trilium.sh printf "#!/bin/sh\n./node/bin/node src/main\n" > $BUILD_DIR/trilium.sh
chmod 755 $BUILD_DIR/trilium.sh chmod 755 $BUILD_DIR/trilium.sh
# TriliumNextTODO: is this still required? If yes → move to copy-dist/copy-trilium
cp tpl/anonymize-database.sql $BUILD_DIR/
VERSION=`jq -r ".version" package.json` VERSION=`jq -r ".version" package.json`
ARCHIVE_NAME="TriliumNextNotes-Server-${VERSION}-linux-${ARCH}" ARCHIVE_NAME="TriliumNextNotes-Server-${VERSION}-linux-${ARCH}"
echo "Creating Archive $ARCHIVE_NAME..." echo "Creating Archive $ARCHIVE_NAME..."