mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	chore(ci): revert changes breaking the workflows
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/checks.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/checks.yml
									
									
									
									
										vendored
									
									
								
							| @@ -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 }} && ${{secrets.MERGE_CONFLICT_LABEL_PAT}} |         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
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/deploy-docs.yml
									
									
									
									
										vendored
									
									
								
							| @@ -118,7 +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}} |         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" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user