Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						911b45ce3b
					
				
					 6 changed files with 170 additions and 83 deletions
				
			
		
							
								
								
									
										61
									
								
								.github/workflows/format.yaml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										61
									
								
								.github/workflows/format.yaml
									
										
									
									
										vendored
									
									
								
							|  | @ -1,47 +1,42 @@ | |||
| name: Format Codebase | ||||
| name: PR Lint Format | ||||
| 
 | ||||
| on: | ||||
|   push: | ||||
|     branches: | ||||
|     - master | ||||
|     - develop | ||||
|   pull_request: | ||||
|     paths: | ||||
|     - 'drivers/**' | ||||
|     - 'lib/arm_atsam/**' | ||||
|     - 'lib/lib8tion/**' | ||||
|     - 'lib/python/**' | ||||
|     - 'platforms/**' | ||||
|     - 'quantum/**' | ||||
|     - 'tests/**' | ||||
|     - 'tmk_core/**' | ||||
| 
 | ||||
| jobs: | ||||
|   format: | ||||
|   lint: | ||||
|     runs-on: ubuntu-latest | ||||
|     container: qmkfm/base_container | ||||
| 
 | ||||
|     # protect against those who develop with their fork on master | ||||
|     if: github.repository == 'qmk/qmk_firmware' | ||||
|     container: qmkfm/base_container | ||||
| 
 | ||||
|     steps: | ||||
|     - uses: rlespinasse/github-slug-action@v3.x | ||||
| 
 | ||||
|     - uses: actions/checkout@v2 | ||||
|       with: | ||||
|         token: ${{ secrets.API_TOKEN_GITHUB }} | ||||
|         fetch-depth: 0 | ||||
| 
 | ||||
|     - name: Install dependencies | ||||
|       run: | | ||||
|         apt-get update && apt-get install -y dos2unix | ||||
| 
 | ||||
|     - name: Format files | ||||
|       run: | | ||||
|         bin/qmk cformat -a | ||||
|         bin/qmk pyformat | ||||
|         bin/qmk fileformat | ||||
| 
 | ||||
|     - name: Become QMK Bot | ||||
|       run: | | ||||
|         git config user.name 'QMK Bot' | ||||
|         git config user.email 'hello@qmk.fm' | ||||
| 
 | ||||
|     - name: Create Pull Request | ||||
|       uses: peter-evans/create-pull-request@v3 | ||||
|     - uses: trilom/file-changes-action@v1.2.4 | ||||
|       id: file_changes | ||||
|       with: | ||||
|         delete-branch: true | ||||
|         branch: bugfix/format_${{ env.GITHUB_REF_SLUG }} | ||||
|         author: QMK Bot <hello@qmk.fm> | ||||
|         committer: QMK Bot <hello@qmk.fm> | ||||
|         commit-message: Format code according to conventions | ||||
|         title: '[CI] Format code according to conventions' | ||||
|         output: ' ' | ||||
|         fileOutput: ' ' | ||||
| 
 | ||||
|     - name: Run qmk cformat and qmk pyformat | ||||
|       shell: 'bash {0}' | ||||
|       run: | | ||||
|         qmk cformat -n $(< ~/files.txt) | ||||
|         cformat_exit=$? | ||||
|         qmk pyformat -n | ||||
|         pyformat_exit=$? | ||||
| 
 | ||||
|         exit $((cformat_exit + pyformat_exit)) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot