mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 19:49:01 +01:00 
			
		
		
		
	Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
This commit is contained in:
		
						commit
						19668d1931
					
				
							
								
								
									
										5
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							| @ -11,6 +11,7 @@ on: | ||||
|   pull_request: | ||||
|     paths: | ||||
|       - .github/actions/build-electron/* | ||||
|       - .github/workflows/nightly.yml | ||||
|       - forge.config.cjs | ||||
| 
 | ||||
| concurrency: | ||||
| @ -76,7 +77,7 @@ jobs: | ||||
|           WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }} | ||||
| 
 | ||||
|       - name: Publish release | ||||
|         uses: softprops/action-gh-release@v2.2.2 | ||||
|         uses: softprops/action-gh-release@v2.3.2 | ||||
|         if: ${{ github.event_name != 'pull_request' }} | ||||
|         with: | ||||
|           make_latest: false | ||||
| @ -116,7 +117,7 @@ jobs: | ||||
|           arch: ${{ matrix.arch }} | ||||
| 
 | ||||
|       - name: Publish release | ||||
|         uses: softprops/action-gh-release@v2.2.2 | ||||
|         uses: softprops/action-gh-release@v2.3.2 | ||||
|         if: ${{ github.event_name != 'pull_request' }} | ||||
|         with: | ||||
|           make_latest: false | ||||
|  | ||||
							
								
								
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @ -114,7 +114,7 @@ jobs: | ||||
|           path: upload | ||||
| 
 | ||||
|       - name: Publish stable release | ||||
|         uses: softprops/action-gh-release@v2.2.2 | ||||
|         uses: softprops/action-gh-release@v2.3.2 | ||||
|         with: | ||||
|           draft: false | ||||
|           body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Elian Doran
						Elian Doran