summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-11-09 15:42:49 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-12-12 12:23:19 +0100
commitf012886949661d3ceff04308ae16d5f930de7649 (patch)
tree76456cd5ad6d9a71cc25a31d35f55c8c3d4f0067
parent8c6bf8b5920c1bb5ef7bf462220890ba4a475e76 (diff)
downloadIshtar-f012886949661d3ceff04308ae16d5f930de7649.tar.bz2
Ishtar-f012886949661d3ceff04308ae16d5f930de7649.zip
Update gitlab CI
-rw-r--r--.gitlab-ci.yml27
-rw-r--r--example_project/local_settings.py.gitlab-ci2
2 files changed, 14 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7a41c5b3..b33ea4728 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ before_script:
- dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=$LANG
- pip3 install -r requirements.txt
- cp Makefile.example Makefile
+ - sed -i -e 's/"registration"/"django_registration"/' example_project/settings.py
- cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py
variables:
@@ -13,42 +14,40 @@ variables:
POSTGRES_USER: gis
POSTGRES_PASSWORD: "gis"
-build-v3:
+build-v4:
stage: "build"
script: "make build_gitlab"
services:
- - mdillon/postgis
+ - postgis/postgis:13-3.3
tags:
- - buster
+ - bullseye
only:
- - main
- - develop
+ - WIP/v4.0
-test-v3:
+test-v4:
stage: "test"
script: "make test_gitlab"
services:
- - mdillon/postgis
+ - postgis/postgis:13-3.3
tags:
- - buster
+ - bullseye
only:
- - main
- - develop
+ - WIP/v4.0
debian:
stage: "test"
script:
- apt-get install -q -y devscripts build-essential lintian wget
- make deb
- - wget -O /etc/apt/sources.list.d/iggdrasil.list http://deb.iggdrasil.net/dists/wheezy/iggdrasil.list
+ - wget -O /etc/apt/sources.list.d/iggdrasil.list http://deb.iggdrasil.net/dists/bullseye/iggdrasil.list
- wget -O - http://deb.iggdrasil.net/contact@iggdrasil.net.gpg.key | apt-key add -
- apt-get update
- apt-get install -q -y --force-yes python-django-ishtar locales-all
- INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance
- dpkg -i python-django-ishtar_*.deb
services:
- - mdillon/postgis
+ - postgis/postgis:13-3.3
tags:
- - buster
+ - bullseye
only:
- - buster
+ - bullseye
diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci
index b8f40b8bb..bc842f004 100644
--- a/example_project/local_settings.py.gitlab-ci
+++ b/example_project/local_settings.py.gitlab-ci
@@ -4,7 +4,7 @@ DATABASES = {
'NAME': 'gis',
'USER': 'gis',
'PASSWORD': 'gis',
- 'HOST': 'mdillon-postgis',
+ 'HOST': 'postgis-postgis',
'PORT': '5432',
}
}