summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2018-07-21 16:57:34 +0200
committermathieui <mathieui@mathieui.net>2018-07-21 20:00:01 +0200
commit481d0b873065cc979834d86026b41d41c368b634 (patch)
treef269d6073459b0ae3030b16bc2c4bbac07c1816a
parentd80ae218aabf8177672fd259df8e439f612ec289 (diff)
downloadpoezio-481d0b873065cc979834d86026b41d41c368b634.tar.gz
poezio-481d0b873065cc979834d86026b41d41c368b634.tar.bz2
poezio-481d0b873065cc979834d86026b41d41c368b634.tar.xz
poezio-481d0b873065cc979834d86026b41d41c368b634.zip
Fix docker CI
Remove our custom images
-rw-r--r--.gitlab-ci.yml36
1 files changed, 25 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb966f0c..543a7e3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,19 +4,20 @@ stages:
build-doc:
stage: build
- image: poezio/build-base:latest
+ image: python:3
script:
- - apt-get install -y make
- pip3 install sphinx
- make doc
artifacts:
expire_in: 2 weeks
paths:
- doc/build/html
+ only:
+ - master
build-ubuntu:
stage: build
- image: poezio/build-base:latest
+ image: python:3
script:
- python3 setup.py sdist
- python3 setup.py bdist
@@ -24,6 +25,8 @@ build-ubuntu:
expire_in: 2 weeks
paths:
- dist/
+ only:
+ - master
security-check:
stage: test
@@ -32,24 +35,35 @@ security-check:
- pip3 install safety
- safety check -r requirements.txt
-test-ubuntu:
+test-pytest:
stage: test
- image: poezio/test-base:latest
+ image: python:3
script:
+ - apt-get update && apt-get install -y libidn11-dev
- git clone git://git.louiz.org/slixmpp
- - pip3 install --upgrade pip
- - pip3 install pytest pyasn1-modules --upgrade
- - pushd slixmpp
- - python3 setup.py build
+ - pip3 install pytest pyasn1-modules cffi --upgrade
+ - cd slixmpp
- python3 setup.py install
- - popd
+ - cd ..
- python3 setup.py install
- py.test -v test/
+
+test-pylint:
+ stage: test
+ image: python:3
+ script:
+ - apt-get update && apt-get install -y libidn11-dev
+ - git clone git://git.louiz.org/slixmpp
+ - pip3 install pylint pyasn1-modules cffi --upgrade
+ - cd slixmpp
+ - python3 setup.py install
+ - cd ..
+ - python3 setup.py install
- pylint -E poezio
formatting-check:
stage: test
- image: poezio/test-base:latest
+ image: python:3
script:
- pip3 install yapf
- yapf -dpr poezio