diff options
author | Gerald Combs <gerald@wireshark.org> | 2020-10-27 10:09:40 -0700 |
---|---|---|
committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-10-28 20:48:49 +0000 |
commit | 05bd5cd91eeee9004efc6ea82d62cad831cda05f (patch) | |
tree | 6d22373e02adb5ff86548ffce906a5a6c59ff94d /.gitlab-ci.yml | |
parent | b1d18e41db5e3b3b5b8b95b405c7dbce5ba14e18 (diff) |
CI+RPM: Disable the Fedora build for now.
Fedora 33's RPM environent added changes that break CMake. Disable it
for now.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b90f08d3c..95a4a1728e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: @@ -263,7 +266,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 |