[glib/wip/hadess/update-docker-packages: 6/9] ci: Require some updated packages Fedora Docker image
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/hadess/update-docker-packages: 6/9] ci: Require some updated packages Fedora Docker image
- Date: Mon, 20 Jan 2020 19:30:00 +0000 (UTC)
commit a2b7f4b2d172c1c5e9e17a55bb2a20c4e83cea9e
Author: Bastien Nocera <hadess hadess net>
Date: Wed Dec 11 17:47:45 2019 +0100
ci: Require some updated packages Fedora Docker image
Rather than installing those updates manually.
.gitlab-ci.yml | 4 ----
.gitlab-ci/fedora.Dockerfile | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50803ee09..8035cfdcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,10 +136,6 @@ installed-tests:
- ninja -C _build
- sudo ninja -C _build install
- cd ..
- # FIXME: Add update until stable https://bodhi.fedoraproject.org/updates/FEDORA-2019-e830287661
- - sudo dnf upgrade -y --enablerepo=updates-testing --advisory=FEDORA-2019-e830287661
- # FIXME: Add update until stable https://bodhi.fedoraproject.org/updates/FEDORA-2019-161b129d4d
- - sudo dnf upgrade -y --enablerepo=updates-testing --advisory=FEDORA-2019-161b129d4d
# Work-around https://gitlab.gnome.org/GNOME/gnome-desktop-testing/merge_requests/2
- mkdir -p _build/installed-tests-report/logs/
- GLIB_TEST_COMPILATION=1 gnome-desktop-testing-runner
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 0d5a84cdd..35190b06a 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -31,7 +31,7 @@ RUN dnf -y install \
glibc-langpack-pl \
glibc-langpack-ru \
glibc-langpack-tr \
- gnome-desktop-testing \
+ "gnome-desktop-testing >= 2018.1" \
gtk-doc \
itstool \
lcov \
@@ -43,7 +43,7 @@ RUN dnf -y install \
ncurses-compat-libs \
ninja-build \
pcre-devel \
- python3-dbusmock \
+ "python3-dbusmock >= 0.18.3-2" \
python3-wheel \
shared-mime-info \
systemtap-sdt-devel \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]