[glib/wip/hadess/update-docker-packages: 41/44] ci: Require some updated packages Fedora Docker image



commit 4aa14d57704c2938fcccc149856fbd5012d64e11
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 cd6c8c932..359c70cb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,10 +158,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 d323e473a..f4e8c5311 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-pygments \
     python3-wheel \
     shared-mime-info \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]