mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	gitlab-ci: stop tags/branches overwriting buildserver docker image
https://gitlab.com/fdroid/fdroidserver/-/jobs/2988110595 https://gitlab.com/eighthave/fdroidserver/-/jobs/2997738047
This commit is contained in:
		
							parent
							
								
									dbe4af7951
								
							
						
					
					
						commit
						2d5d98fe32
					
				
					 1 changed files with 6 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -560,6 +560,10 @@ pages:
 | 
			
		|||
    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'  # only publish pages on default (master) branch
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# This job pushes the official CI docker image based on the master
 | 
			
		||||
# branch, so in fdroid/fdroidserver, it should only run on the master
 | 
			
		||||
# branch.  Otherwise, tags or other branches will overwrite the docker
 | 
			
		||||
# image which is supposed to be what is in master.
 | 
			
		||||
docker:
 | 
			
		||||
  dependencies:
 | 
			
		||||
    - fdroid build
 | 
			
		||||
| 
						 | 
				
			
			@ -568,6 +572,8 @@ docker:
 | 
			
		|||
      - .gitlab-ci.yml
 | 
			
		||||
      - makebuildserver
 | 
			
		||||
      - buildserver/*
 | 
			
		||||
    variables:
 | 
			
		||||
      - $CI_COMMIT_BRANCH == "master" || $CI_PROJECT_NAMESPACE != "fdroid"
 | 
			
		||||
  image: docker:git
 | 
			
		||||
  services:
 | 
			
		||||
    - docker:dind
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue