Skip to content

Commit

Permalink
Maybe this will work?
Browse files Browse the repository at this point in the history
  • Loading branch information
orf committed Sep 19, 2019
1 parent 62b1199 commit 90f0e2e
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 2 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@ jobs:
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull ${{ matrix.compose_app }}
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run ${{ matrix.compose_app }}

sqlite-windows:
name: sqlite-windows
strategy:
fail-fast: false
matrix:
python_version:
- 3.6-windowsservercore-ltsc2016
- 3.7-windowsservercore-ltsc2016
runs-on: windows-latest
steps:
- uses: actions/checkout@master
- run: git clone https://github.com/django/django.git --depth=1 ${GITHUB_WORKSPACE}/django
- run: docker-compose pull --include-deps sqlite || true
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose build --pull sqlite
env:
PYTHON_VERSION: ${{ matrix.python_version }}
- run: DJANGO_PATH=${GITHUB_WORKSPACE}/django docker-compose run sqlite
env:
PYTHON_VERSION: ${{ matrix.python_version }}

sqlite:
name: sqlite
strategy:
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ARG PYTHON_VERSION
FROM python:${PYTHON_VERSION}

COPY --chown=test:test tests/requirements/ c:/requirements/
RUN $files = @(Get-ChildItem c:\requirements\*.txt); \
foreach ($file in $files) { pip install -r $file }; \
pip install flake8 flake8-isort sphinx pyenchant sphinxcontrib-spelling selenium unittest-xml-reporting
19 changes: 17 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,28 @@ x-postgres-base: &postgres-base
services:
sqlite:
<<: *base
environment:
- DJANGO_SETTINGS_MODULE=settings.test_sqlite
build:
context: ${DJANGO_PATH}
dockerfile: ${PWD}/Dockerfile
entrypoint: python tests/runtests.py
depends_on:
- memcached
- memcached2

sqlite-windows:
<<: *base
build:
context: ${DJANGO_PATH}
dockerfile: ${PWD}/Dockerfile.windows
args:
- PYTHON_VERSION=${PYTHON_VERSION}
environment:
- DJANGO_SETTINGS_MODULE=settings.test_sqlite
entrypoint: python tests/runtests.py
depends_on:
- memcached
- memcached2

sqlite-gis:
<<: *base
entrypoint: python tests/runtests.py
Expand Down

0 comments on commit 90f0e2e

Please sign in to comment.