Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
							
								
								
									
										7
									
								
								.github/workflows/format.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/format.yaml
									
									
									
									
										vendored
									
									
								
							@@ -36,11 +36,10 @@ jobs:
 | 
			
		||||
    - name: Run qmk formatters
 | 
			
		||||
      shell: 'bash {0}'
 | 
			
		||||
      run: |
 | 
			
		||||
        set +e
 | 
			
		||||
        cat ~/files_added.txt ~/files_modified.txt > ~/files_changed.txt
 | 
			
		||||
        qmk format-c --core-only $(< ~/files_changed.txt)
 | 
			
		||||
        qmk format-python $(< ~/files_changed.txt)
 | 
			
		||||
        qmk format-text $(< ~/files_changed.txt)
 | 
			
		||||
        qmk format-c --core-only $(< ~/files_changed.txt) || true
 | 
			
		||||
        qmk format-python $(< ~/files_changed.txt) || true
 | 
			
		||||
        qmk format-text $(< ~/files_changed.txt) || true
 | 
			
		||||
 | 
			
		||||
    - name: Fail when formatting required
 | 
			
		||||
      run: |
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user