summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2019-07-23 11:19:57 +0100
committerSimon McVittie <smcv@collabora.com>2019-07-23 11:53:54 +0100
commit895928212e4d7ae762e77312046c5dc8e30e8c74 (patch)
tree59b0efa29356c10ff76a0a9de14fa049c2138bdc
parent9b0ec8b2042bce8758270768a49eb08865539833 (diff)
downloaddbus-python-895928212e4d7ae762e77312046c5dc8e30e8c74.tar.gz
Add Gitlab-CI integration
Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--.gitlab-ci.yml80
-rwxr-xr-xtools/ci-build.sh4
2 files changed, 82 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..ccc6094
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,80 @@
+# Copyright © 2015-2019 Collabora Ltd.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+image: debian:buster-slim
+
+stages:
+ - build
+
+before_script:
+ - ./tools/ci-install.sh
+
+variables:
+ ci_in_docker: "yes"
+ ci_parallel: "2"
+ ci_sudo: "yes"
+ ci_distro: "debian"
+ ci_suite: "buster"
+
+build:python2.7:
+ stage: build
+ variables:
+ dbus_ci_system_python: python
+ script: &script
+ - chown -R user .
+ - runuser -u user env PATH="/usr/lib/ccache:$PATH" ./tools/ci-build.sh
+
+build:python2.7-dbg:
+ stage: build
+ variables:
+ dbus_ci_system_python: python-dbg
+ script: *script
+
+build:python3.5:
+ stage: build
+ image: "debian:stretch-slim"
+ variables:
+ ci_suite: stretch
+ dbus_ci_system_python: python3
+ script: *script
+
+build:python3.5-dbg:
+ stage: build
+ image: "debian:stretch-slim"
+ variables:
+ ci_suite: stretch
+ dbus_ci_system_python: python3-dbg
+ script: *script
+
+build:python3.7:
+ stage: build
+ variables:
+ dbus_ci_system_python: python3
+ script: *script
+
+build:python3.7-dbg:
+ stage: build
+ variables:
+ dbus_ci_system_python: python3-dbg
+ script: *script
+
+# vim:set sw=2 sts=2 et:
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index ac4e59d..d1dd528 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -50,7 +50,7 @@ if [ -n "$ci_docker" ]; then
tools/ci-build.sh
fi
-if [ -n "$TRAVIS" ] && [ -n "$dbus_ci_system_python" ]; then
+if [ -n "$dbus_ci_system_python" ]; then
# Reset to standard paths to use the Ubuntu version of python
unset LDFLAGS
unset PYTHONPATH
@@ -67,7 +67,7 @@ if [ -n "$TRAVIS" ] && [ -n "$dbus_ci_system_python" ]; then
# AX_PYTHON_DEVEL the information it needs to know
# that it should link -lpython2.7_d and not
# -lpython2.7.
- export PYTHON_LIBS="-lpython${TRAVIS_PYTHON_VERSION}_d"
+ export PYTHON_LIBS="-lpython2.7_d"
;;
esac