gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-02-22 13:44:25 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into standalone

Browse Source
This commit is contained in:
Elian Doran 2026-01-30 07:51:36 +02:00
commit bc5b9708c7
No known key found for this signature in database
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/checks.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
steps: steps:
- name: Check if PRs have conflicts - name: Check if PRs have conflicts
uses: eps1lon/actions-label-merge-conflict@v3 uses: eps1lon/actions-label-merge-conflict@v3
if: github.repository == ${{ vars.REPO_MAIN }} if: ${{ github.repository == vars.REPO_MAIN }}
with: with:
dirtyLabel: "merge-conflicts" dirtyLabel: "merge-conflicts"
repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}" repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}"

2
.github/workflows/deploy-docs.yml vendored
View File

@ -67,7 +67,7 @@ jobs:
- name: Deploy - name: Deploy
uses: ./.github/actions/deploy-to-cloudflare-pages uses: ./.github/actions/deploy-to-cloudflare-pages
if: github.repository == ${{ vars.REPO_MAIN }} if: ${{ github.repository == vars.REPO_MAIN }}
with: with:
project_name: "trilium-docs" project_name: "trilium-docs"
comment_body: "📚 Documentation preview is ready" comment_body: "📚 Documentation preview is ready"

4
.github/workflows/nightly.yml vendored
View File

@ -26,7 +26,7 @@ permissions:
jobs: jobs:
nightly-electron: nightly-electron:
if: github.repository == ${{ vars.REPO_MAIN }} if: ${{ github.repository == vars.REPO_MAIN }}
name: Deploy nightly name: Deploy nightly
strategy: strategy:
fail-fast: false fail-fast: false
@ -109,7 +109,7 @@ jobs:
path: apps/desktop/upload path: apps/desktop/upload
nightly-server: nightly-server:
if: github.repository == ${{ vars.REPO_MAIN }} if: ${{ github.repository == vars.REPO_MAIN }}
name: Deploy server nightly name: Deploy server nightly
strategy: strategy:
fail-fast: false fail-fast: false