diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-03-07 16:13:22 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | 8967c4ee6fef99c70ce086cd3e52b56712d4d372 (patch) | |
| tree | ce9870826f680a9e3816b183dd8c409de7cfb6ac | |
| parent | 0f3229a119e53054d98c5e878a9581403628cd08 (diff) | |
| download | Ishtar-8967c4ee6fef99c70ce086cd3e52b56712d4d372.tar.bz2 Ishtar-8967c4ee6fef99c70ce086cd3e52b56712d4d372.zip | |
Adapt CI for python3 branch
| -rw-r--r-- | .gitlab-ci.yml | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a581f81fc..eea913262 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ before_script: - - apt-get update - - apt-get install -q -y git python-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc - - pip install -r requirements.txt + - apt update + - apt install -q -y git python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc + - pip3 install -r requirements.txt - cp Makefile.example Makefile - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py @@ -10,17 +10,6 @@ variables: POSTGRES_USER: gis POSTGRES_PASSWORD: "gis" -build: - stage: "build" - script: "make build_gitlab" - services: - - iggdrasil/postgis-1.5 - tags: - - wheezy - only: - - v1.0 - - wheezy - build-v2: stage: "build" script: "make build_gitlab" @@ -34,16 +23,15 @@ build-v2: - v2.0 - stretch -test: - stage: "test" - script: "make test_gitlab" +build-v3: + stage: "build" + script: "make build_gitlab" services: - - iggdrasil/postgis-1.5 + - mdillon/postgis tags: - - wheezy + - stretch only: - - v1.0 - - wheezy + - WIP/python3 test-v2: stage: "test" @@ -58,6 +46,16 @@ test-v2: - v2.0 - stretch +test-v3: + stage: "test" + script: "make test_gitlab" + services: + - mdillon/postgis + tags: + - stretch + only: + - WIP/python3 + debian: stage: "test" script: |