Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
867f9dfc
Commit
867f9dfc
authored
Jan 11, 2018
by
Thom Wiggers
📐
Browse files
Merge branch 'fix/ci-build-docker' into 'master'
Change images for django20 tests in CI See merge request
!651
parents
d1e3ed2f
d6c88080
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
867f9dfc
...
...
@@ -10,6 +10,7 @@ variables:
# - pip: tox, coverage
# - apt: ghostscript
PY35_IMAGE
:
twiggers/python-thalia:3.5
PY36_IMAGE
:
twiggers/python-thalia:3.6
PIP_CACHE_DIR
:
"
${CI_PROJECT_DIR}/pip-cache"
pep8
:
...
...
@@ -37,14 +38,14 @@ python35-django11:
python35-django20
:
<<
:
*djangotest
image
:
python:3.5
image
:
$PY35_IMAGE
variables
:
PYTHON_VERSION
:
py35
DJANGO_VERSION
:
django20
python36-django20
:
<<
:
*djangotest
image
:
python:3.6
image
:
$PY36_IMAGE
variables
:
PYTHON_VERSION
:
py36
DJANGO_VERSION
:
django20
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment