CI+RPM: Disable the Fedora build for now.

Fedora 33's RPM environent added changes that break CMake. Disable it
for now.


(cherry picked from commit 05bd5cd91e)
This commit is contained in:
Gerald Combs 2020-10-27 17:09:40 +00:00 committed by Wireshark GitLab Utility
parent b387f0c4db
commit de66fa058f
2 changed files with 12 additions and 3 deletions

View File

@ -99,7 +99,9 @@ test:rpm-opensuse-15.1:
GIT_STRATEGY: none
dependencies:
- build:rpm-opensuse-15.1
build:rpm-fedora:
# Disabled for now due to issues with Fedora 33.
.build:rpm-fedora:
<<: *build-rpm
image: fedora
script:
@ -109,7 +111,8 @@ build:rpm-fedora:
- cd build
- cmake3 -GNinja ..
- ninja-build rpm-package
test:rpm-fedora:
.test:rpm-fedora:
image: fedora
stage: test
script:
@ -240,7 +243,7 @@ merge-req:ubuntu-clang-other-tests:
artifacts:
paths:
- cppcheck_report.xml
- cppcheck_report.html
- cppcheck_report.html
# XXX This is still beta:
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta

View File

@ -226,6 +226,7 @@ Wireshark. A Qt graphical user interface is packaged separately.
%package qt
Summary: Wireshark's Qt-based GUI
Group: Applications/Internet
# XXX Fedora 33 requires versioned "Obsoletes" declarations.
Obsoletes: wireshark-gnome wireshark-gtk
%description qt
This package contains the Qt Wireshark GUI and desktop integration files.
@ -281,6 +282,11 @@ development of Wireshark scripts and plugins.
%define _bindir /usr/bin
%endif
# XXX How do we reliably run CMake for all of CentOS, Fedora, RHEL, and openSUSE?
# The percent-cmake macro in Fedora >= 33 runs
# /usr/bin/cmake -S . -B x86_64-redhat-linux-gnu
# which presumably means we need to use the cmake_build and cmake_install
# macros described at https://docs.fedoraproject.org/en-US/packaging-guidelines/CMake/
%if 0%{?rhel}
cmake3 \
%else