[jhbuild] CI: use ubuntu 20.04
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] CI: use ubuntu 20.04
- Date: Sun, 13 Dec 2020 10:32:01 +0000 (UTC)
commit a285500c82a7704da19aef7296e8e064972f6252
Author: Christoph Reiter <reiter christoph gmail com>
Date: Sun Dec 13 11:04:24 2020 +0100
CI: use ubuntu 20.04
19.04 is gone
.gitlab-ci.yml | 6 +++---
.gitlab-ci/Dockerfile | 8 ++++----
.gitlab-ci/build-docker.sh | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 344c680c..593c4eb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
- deploy
test-py3:
- image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v4
+ image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v5
script:
# autotools install
- mkdir _build && cd _build
@@ -26,8 +26,8 @@ test-py3:
paths:
- public
-ub19.04-py3-glib:
- image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v4
+ub20.04-py3-glib:
+ image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v5
script:
- ./autogen.sh --with-python=python3
- make
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index e18a043c..d00513af 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:19.10
+FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive
@@ -7,6 +7,7 @@ RUN apt update && apt install -y \
autoconf \
automake \
autopoint \
+ build-essential \
gettext \
git \
libtool \
@@ -14,14 +15,13 @@ RUN apt update && apt install -y \
patch \
pkg-config \
python \
- python-flake8 \
- python-pytest \
python3 \
python3-flake8 \
python3-pytest \
sudo \
trang \
- yelp-tools
+ yelp-tools \
+ && rm -rf /var/lib/apt/lists/*
RUN useradd -u 1000 -ms /bin/bash user
RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
diff --git a/.gitlab-ci/build-docker.sh b/.gitlab-ci/build-docker.sh
index 398c79cd..ceae822b 100755
--- a/.gitlab-ci/build-docker.sh
+++ b/.gitlab-ci/build-docker.sh
@@ -2,6 +2,6 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v4"
+TAG="registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v5"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]