Fix failed develop updates within CI (#11001)
* Fix inverted logic * skip locked instead of fail
This commit is contained in:
		
							parent
							
								
									a952bf2d31
								
							
						
					
					
						commit
						ca9edc5fe3
					
				
					 1 changed files with 5 additions and 2 deletions
				
			
		
							
								
								
									
										7
									
								
								.github/workflows/develop_update.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/develop_update.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -23,10 +23,13 @@ jobs:
 | 
			
		|||
        git checkout develop
 | 
			
		||||
 | 
			
		||||
    - name: Check if branch locked
 | 
			
		||||
      run: |
 | 
			
		||||
        test -e .locked || exit 1
 | 
			
		||||
      id: check_locked
 | 
			
		||||
      uses: andstor/file-existence-action@v1
 | 
			
		||||
      with:
 | 
			
		||||
        files: ".locked"
 | 
			
		||||
 | 
			
		||||
    - name: Update develop from master
 | 
			
		||||
      if: steps.check_locked.outputs.files_exists == 'false'
 | 
			
		||||
      run: |
 | 
			
		||||
        git merge origin/master
 | 
			
		||||
        git push origin develop
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue