From d38d6bf8eac95bd4947b322ebbedf50bb962fd98 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 20 Nov 2019 14:14:24 +0100 Subject: [PATCH 1/5] ci: Add gnome-desktop-testing to the Fedora docker image With plans to run the installed-tests on Fedora soon. --- .gitlab-ci/fedora.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 51ec8dc0d..032b3616a 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -31,6 +31,7 @@ RUN dnf -y install \ glibc-langpack-pl \ glibc-langpack-ru \ glibc-langpack-tr \ + gnome-desktop-testing \ gtk-doc \ itstool \ lcov \ From aa8908f46977b62889949977d19683d9cf1c3cd3 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 20 Nov 2019 14:15:00 +0100 Subject: [PATCH 2/5] ci: Update the Fedora docker to a supported version Fedora 29 is only supported up until 2019-11-29, bump version to 30. --- .gitlab-ci/fedora.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 032b3616a..5b01c93ee 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:30 RUN dnf -y install \ bindfs \ From fd4d68615fbf6c72e62687dcbe93ec23cc842e46 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 20 Nov 2019 14:54:09 +0100 Subject: [PATCH 3/5] ci: Add sudo support for default Fedora docker user --- .gitlab-ci/fedora.Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 5b01c93ee..f3319a20e 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -57,9 +57,12 @@ RUN dnf -y install \ RUN pip3 install meson==0.49.2 +# Enable sudo for wheel users +RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers + ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} -RUN useradd -u $HOST_USER_ID -ms /bin/bash user +RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user USER user WORKDIR /home/user From c625c37dde7f349b6c0d3a685a07d83b89f3938b Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 20 Nov 2019 15:41:18 +0100 Subject: [PATCH 4/5] ci: Remove python3{,-pip} from list of packages Package python3-3.7.5-1.fc30.x86_64 is already installed. Package python3-pip-19.0.3-3.fc30.noarch is already installed. --- .gitlab-ci/fedora.Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index f3319a20e..ceae6f69a 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -43,8 +43,6 @@ RUN dnf -y install \ ncurses-compat-libs \ ninja-build \ pcre-devel \ - python3 \ - python3-pip \ python3-wheel \ shared-mime-info \ systemtap-sdt-devel \ From cd11067a0345f2125da1da1beb81c95115c834eb Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 27 Nov 2019 13:22:26 +0000 Subject: [PATCH 5/5] ci: Use new Fedora v5 Docker image for all CI jobs v5 was built using the fedora.Dockerfile updates from the previous few commits. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3c18c952..660173651 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ style-check-diff: fedora-x86_64: <<: *only-default - image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 stage: build variables: CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" @@ -100,7 +100,7 @@ debian-stable-x86_64: G_DISABLE_ASSERT: <<: *only-default - image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 stage: build variables: CPPFLAGS: "-DG_DISABLE_ASSERT" @@ -127,7 +127,7 @@ G_DISABLE_ASSERT: valgrind: <<: *only-default - image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 stage: analysis variables: MESON_TEST_TIMEOUT_MULTIPLIER: 10 @@ -298,7 +298,7 @@ freebsd-12-x86_64: coverage: <<: *only-default - image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 stage: coverage artifacts: name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" @@ -310,7 +310,7 @@ coverage: scan-build: <<: *only-default - image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 stage: analysis script: - meson ${MESON_COMMON_OPTIONS} @@ -341,7 +341,7 @@ pages: - public dist-job: - image: registry.gitlab.gnome.org/gnome/glib/fedora:v4 + image: registry.gitlab.gnome.org/gnome/glib/fedora:v5 stage: build only: - tags