mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-08-10 18:39:22 +08:00
Merge branch 'develop' into deps_mermaid
This commit is contained in:
commit
8b823f2a57
3
.github/actions/build-server/action.yml
vendored
3
.github/actions/build-server/action.yml
vendored
@ -28,4 +28,5 @@ runs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir -p upload
|
mkdir -p upload
|
||||||
file=$(find dist -name '*.tar.xz' -print -quit)
|
file=$(find dist -name '*.tar.xz' -print -quit)
|
||||||
cp "$file" "upload/TriliumNextNotes-Server-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz"
|
name=${{ github.ref_name }}
|
||||||
|
cp "$file" "upload/TriliumNextNotes-Server-${name//\//-}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz"
|
||||||
|
79
.github/actions/report-size/action.yml
vendored
Normal file
79
.github/actions/report-size/action.yml
vendored
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
name: 'Bundle size reporter'
|
||||||
|
description: 'Post bundle size difference compared to another branch'
|
||||||
|
inputs:
|
||||||
|
branch:
|
||||||
|
description: 'Branch to compare to'
|
||||||
|
required: true
|
||||||
|
default: 'main'
|
||||||
|
paths:
|
||||||
|
description:
|
||||||
|
'Paths to json file bundle size report or folder containing bundles'
|
||||||
|
required: true
|
||||||
|
default: '/'
|
||||||
|
onlyDiff:
|
||||||
|
description: 'Report only different sizes'
|
||||||
|
required: false
|
||||||
|
default: 'false'
|
||||||
|
filter:
|
||||||
|
description: 'Regex filter based on file path'
|
||||||
|
required: false
|
||||||
|
unit:
|
||||||
|
description: 'Size unit'
|
||||||
|
required: false
|
||||||
|
default: 'KB'
|
||||||
|
|
||||||
|
# Comment inputs
|
||||||
|
comment:
|
||||||
|
description: 'Post comment'
|
||||||
|
required: false
|
||||||
|
default: 'true'
|
||||||
|
header:
|
||||||
|
description: 'Comment header'
|
||||||
|
required: false
|
||||||
|
default: 'Bundle size report'
|
||||||
|
append:
|
||||||
|
description: 'Append comment'
|
||||||
|
required: false
|
||||||
|
default: 'false'
|
||||||
|
ghToken:
|
||||||
|
description: 'Github token'
|
||||||
|
required: false
|
||||||
|
|
||||||
|
runs:
|
||||||
|
using: 'composite'
|
||||||
|
steps:
|
||||||
|
# Checkout branch to compare to [required]
|
||||||
|
- name: Checkout base branch
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.branch }}
|
||||||
|
path: br-base
|
||||||
|
token: ${{ inputs.ghToken }}
|
||||||
|
|
||||||
|
# Generate the bundle size difference report [required]
|
||||||
|
- name: Generate report
|
||||||
|
id: bundleSize
|
||||||
|
uses: nejcm/bundle-size-reporter-action@v1.4.1
|
||||||
|
with:
|
||||||
|
paths: ${{ inputs.paths }}
|
||||||
|
onlyDiff: ${{ inputs.onlyDiff }}
|
||||||
|
filter: ${{ inputs.filter }}
|
||||||
|
unit: ${{ inputs.unit }}
|
||||||
|
|
||||||
|
# Post github action summary
|
||||||
|
- name: Post summary
|
||||||
|
if: ${{ steps.bundleSize.outputs.hasDifferences == 'true' }} # post only in case of changes
|
||||||
|
run: |
|
||||||
|
echo '${{ steps.bundleSize.outputs.summary }}' >> $GITHUB_STEP_SUMMARY
|
||||||
|
shell: bash
|
||||||
|
|
||||||
|
# Post github action comment
|
||||||
|
- name: Post comment
|
||||||
|
uses: marocchino/sticky-pull-request-comment@v2
|
||||||
|
if: ${{ steps.bundleSize.outputs.hasDifferences == 'true' }} # post only in case of changes
|
||||||
|
with:
|
||||||
|
number: ${{ github.event.pull_request.number }}
|
||||||
|
header: ${{ inputs.header }}
|
||||||
|
append: ${{ inputs.append }}
|
||||||
|
message: '${{ steps.bundleSize.outputs.summary }}'
|
||||||
|
GITHUB_TOKEN: ${{ inputs.ghToken }}
|
66
.github/workflows/dev.yml
vendored
66
.github/workflows/dev.yml
vendored
@ -15,7 +15,73 @@ env:
|
|||||||
IMAGE_NAME: ${{ github.repository_owner }}/notes
|
IMAGE_NAME: ${{ github.repository_owner }}/notes
|
||||||
TEST_TAG: ${{ github.repository_owner }}/notes:test
|
TEST_TAG: ${{ github.repository_owner }}/notes:test
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
pull-requests: write # for PR comments
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
report-electron-size:
|
||||||
|
name: Report Electron size
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout the repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up node & dependencies
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
cache: "npm"
|
||||||
|
|
||||||
|
- run: npm ci
|
||||||
|
|
||||||
|
- name: Run the build
|
||||||
|
uses: ./.github/actions/build-electron
|
||||||
|
with:
|
||||||
|
os: linux
|
||||||
|
arch: x64
|
||||||
|
shell: bash
|
||||||
|
forge_platform: linux
|
||||||
|
|
||||||
|
- name: Run the Electron size report
|
||||||
|
uses: ./.github/actions/report-size
|
||||||
|
with:
|
||||||
|
paths: 'upload/**/*'
|
||||||
|
onlyDiff: 'true'
|
||||||
|
branch: 'develop'
|
||||||
|
header: 'Electron size report'
|
||||||
|
unit: "MB"
|
||||||
|
ghToken: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
report-server-size:
|
||||||
|
name: Report server size
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout the repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up node & dependencies
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
cache: "npm"
|
||||||
|
|
||||||
|
- run: npm ci
|
||||||
|
|
||||||
|
- name: Run the build
|
||||||
|
uses: ./.github/actions/build-server
|
||||||
|
with:
|
||||||
|
os: linux
|
||||||
|
arch: x64
|
||||||
|
|
||||||
|
- name: Run the server size report
|
||||||
|
uses: ./.github/actions/report-size
|
||||||
|
with:
|
||||||
|
paths: 'upload/**/*'
|
||||||
|
onlyDiff: 'true'
|
||||||
|
branch: 'develop'
|
||||||
|
header: 'Server size report'
|
||||||
|
unit: "MB"
|
||||||
|
ghToken: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
test_dev:
|
test_dev:
|
||||||
name: Test development
|
name: Test development
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
33
.github/workflows/nightly.yml
vendored
33
.github/workflows/nightly.yml
vendored
@ -83,3 +83,36 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}
|
name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}
|
||||||
path: upload
|
path: upload
|
||||||
|
|
||||||
|
nightly-server:
|
||||||
|
name: Deploy server nightly
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
arch: [x64, arm64]
|
||||||
|
include:
|
||||||
|
- arch: x64
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
- arch: arm64
|
||||||
|
runs-on: ubuntu-24.04-arm
|
||||||
|
runs-on: ${{ matrix.runs-on }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Run the build
|
||||||
|
uses: ./.github/actions/build-server
|
||||||
|
with:
|
||||||
|
os: linux
|
||||||
|
arch: ${{ matrix.arch }}
|
||||||
|
|
||||||
|
- name: Publish release
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
|
with:
|
||||||
|
make_latest: false
|
||||||
|
prerelease: true
|
||||||
|
draft: false
|
||||||
|
fail_on_unmatched_files: true
|
||||||
|
files: upload/*.*
|
||||||
|
tag_name: nightly
|
||||||
|
name: Nightly Build
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,6 +2,7 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
node_modules/
|
node_modules/
|
||||||
dist/
|
dist/
|
||||||
|
upload/
|
||||||
build/
|
build/
|
||||||
coverage/
|
coverage/
|
||||||
src/public/app-dist/
|
src/public/app-dist/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user