summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2020-05-19 09:04:12 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2020-05-19 19:18:55 +0200
commita0b335a8b22247ef389a59d2c87d1ff09961e481 (patch)
tree2dcaf8d6f5de5f2c46a02ff82e0f936aafee26e0 /.gitlab-ci
parenta943f572dd2de0ed8ca438702ad2ba8ef80d7934 (diff)
downloadgobject-introspection-a0b335a8b22247ef389a59d2c87d1ff09961e481.tar.gz
CI: add two jobs building a project using g-i with meson and autotools
This tests that after installing the g-i tools a simple project using them can be build with meson and autotools. Fixes #341
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile2
-rwxr-xr-x.gitlab-ci/run-docker.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 0dec6700..3a579cf8 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -43,6 +43,7 @@ RUN dnf -y install \
python3-wheel \
readline-devel \
redhat-rpm-config \
+ sudo \
sqlite-devel \
systemtap-sdt-devel \
zlib-devel \
@@ -53,6 +54,7 @@ RUN pip3 install meson==0.50.1
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER user
WORKDIR /home/user
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 5d29002c..8e6a04ab 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v6"
+TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v7"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .