mirror of
				https://github.com/cookiecutter/cookiecutter-django.git
				synced 2025-11-04 01:47:28 +03:00 
			
		
		
		
	Merge pull request #3112 from Tamerz/fix-gitlab-ci
This commit is contained in:
		
						commit
						c6d7739d7a
					
				| 
						 | 
					@ -21,7 +21,6 @@ flake8:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
pytest:
 | 
					pytest:
 | 
				
			||||||
  stage: test
 | 
					  stage: test
 | 
				
			||||||
  image: python:3.8
 | 
					 | 
				
			||||||
  {% if cookiecutter.use_docker == 'y' -%}
 | 
					  {% if cookiecutter.use_docker == 'y' -%}
 | 
				
			||||||
  image: docker/compose:latest
 | 
					  image: docker/compose:latest
 | 
				
			||||||
  tags:
 | 
					  tags:
 | 
				
			||||||
| 
						 | 
					@ -35,7 +34,8 @@ pytest:
 | 
				
			||||||
    - docker-compose -f local.yml up -d
 | 
					    - docker-compose -f local.yml up -d
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - docker-compose -f local.yml run django pytest
 | 
					    - docker-compose -f local.yml run django pytest
 | 
				
			||||||
  {%- else %}
 | 
					  {%- else -%}
 | 
				
			||||||
 | 
					  image: python:3.8
 | 
				
			||||||
  tags:
 | 
					  tags:
 | 
				
			||||||
    - python
 | 
					    - python
 | 
				
			||||||
  services:
 | 
					  services:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user