forked from mirrors/qmk_userspace
		
	Also disable line ending conversion for merge workflows (#17953)
This commit is contained in:
		
					parent
					
						
							
								a3b06fd87c
							
						
					
				
			
			
				commit
				
					
						0002b1cc20
					
				
			
		
					 2 changed files with 8 additions and 0 deletions
				
			
		
							
								
								
									
										4
									
								
								.github/workflows/develop_update.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/develop_update.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -17,6 +17,10 @@ jobs:
 | 
			
		|||
        token: ${{ secrets.QMK_BOT_TOKEN }}
 | 
			
		||||
        fetch-depth: 0
 | 
			
		||||
 | 
			
		||||
    - name: Disable automatic eol conversion
 | 
			
		||||
      run: |
 | 
			
		||||
        echo "* -text" > .git/info/attributes
 | 
			
		||||
 | 
			
		||||
    - name: Checkout develop
 | 
			
		||||
      run: |
 | 
			
		||||
        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 }}
 | 
			
		||||
        fetch-depth: 0
 | 
			
		||||
 | 
			
		||||
    - name: Disable automatic eol conversion
 | 
			
		||||
      run: |
 | 
			
		||||
        echo "* -text" > .git/info/attributes
 | 
			
		||||
 | 
			
		||||
    - name: Checkout branch
 | 
			
		||||
      run: |
 | 
			
		||||
        git fetch origin develop ${{ matrix.branch }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue