From 8fab4dd94d81c19bc7bcc2fa22e76f23c80427bb Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Thu, 9 Oct 2025 13:27:49 +0300 Subject: [PATCH] chore(ci): use different check --- .github/workflows/checks.yml | 2 +- .github/workflows/deploy-docs.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 5084d2011..201814f9d 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Check if PRs have conflicts uses: eps1lon/actions-label-merge-conflict@v3 - if: github.repository == ${{ vars.REPO_MAIN }} + if: github.repository == ${{ vars.REPO_MAIN }} && ${{secrets.MERGE_CONFLICT_LABEL_PAT}} with: dirtyLabel: "merge-conflicts" repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}" diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 6abd9af47..339ede702 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -118,6 +118,7 @@ jobs: - name: Deploy uses: ./.github/actions/deploy-to-cloudflare-pages + if: github.repository == ${{ vars.REPO_MAIN }} && ${{secrets.CLOUDFLARE_API_TOKEN}} with: project_name: "trilium-docs" comment_body: "📚 Documentation preview is ready"