forked from mfulz_github/qmk_firmware
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						1d33baac8f
					
				
							
								
								
									
										4
									
								
								.github/workflows/develop_update.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/develop_update.yml
									
									
									
									
										vendored
									
									
								
							@ -17,6 +17,10 @@ jobs:
 | 
				
			|||||||
        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
					        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: Disable automatic eol conversion
 | 
				
			||||||
 | 
					      run: |
 | 
				
			||||||
 | 
					        echo "* -text" > .git/info/attributes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Checkout develop
 | 
					    - name: Checkout develop
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        git fetch origin master develop
 | 
					        git fetch origin master develop
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/workflows/feature_branch_update.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/feature_branch_update.yml
									
									
									
									
										vendored
									
									
								
							@ -22,6 +22,10 @@ jobs:
 | 
				
			|||||||
        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
					        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
				
			||||||
        fetch-depth: 0
 | 
					        fetch-depth: 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - name: Disable automatic eol conversion
 | 
				
			||||||
 | 
					      run: |
 | 
				
			||||||
 | 
					        echo "* -text" > .git/info/attributes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Checkout branch
 | 
					    - name: Checkout branch
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        git fetch origin develop ${{ matrix.branch }}
 | 
					        git fetch origin develop ${{ matrix.branch }}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user