mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +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:
 | 
			
		||||
      - name: Check if PRs have conflicts
 | 
			
		||||
        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:
 | 
			
		||||
          dirtyLabel: "merge-conflicts"
 | 
			
		||||
          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
 | 
			
		||||
        uses: ./.github/actions/deploy-to-cloudflare-pages
 | 
			
		||||
        if: github.repository == ${{ vars.REPO_MAIN }} && ${{secrets.CLOUDFLARE_API_TOKEN}}
 | 
			
		||||
        if: github.repository == ${{ vars.REPO_MAIN }}
 | 
			
		||||
        with:
 | 
			
		||||
          project_name: "trilium-docs"
 | 
			
		||||
          comment_body: "📚 Documentation preview is ready"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user