chore(ci): use different check

This commit is contained in:
Elian Doran 2025-10-09 13:27:49 +03:00
parent 1b2be2c345
commit 8fab4dd94d
No known key found for this signature in database
2 changed files with 2 additions and 1 deletions

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 }} && ${{secrets.MERGE_CONFLICT_LABEL_PAT}}
with: with:
dirtyLabel: "merge-conflicts" dirtyLabel: "merge-conflicts"
repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}" repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}"

View File

@ -118,6 +118,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 }} && ${{secrets.CLOUDFLARE_API_TOKEN}}
with: with:
project_name: "trilium-docs" project_name: "trilium-docs"
comment_body: "📚 Documentation preview is ready" comment_body: "📚 Documentation preview is ready"