From 99bad1d667a53f275460d3d9de8a57a596b43f04 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 16 Nov 2020 15:14:27 -0800 Subject: [PATCH] CI: Switch the Fedora image to wireshark-fedora-dev. --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71f4acd35e..9ffb6cabcc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,12 +145,15 @@ test:rpm-opensuse-15.2: GIT_STRATEGY: none dependencies: - build:rpm-opensuse-15.2 + +# The custom Fedora image pre-installs dependencies and compilers to speed up the build: +# https://hub.docker.com/repository/docker/wireshark/wireshark-fedora-dev +# https://gitlab.com/wireshark/wireshark-containers/-/tree/master/dev/fedora build:rpm-fedora: <<: *build-rpm - image: fedora + image: wireshark/wireshark-fedora-dev script: - - dnf upgrade -y - - tools/rpm-setup.sh --install-optional -y + #- dnf upgrade -y - mkdir build - cd build - cmake3 -GNinja ..