diff options
| author | John Thacker <johnthacker@gmail.com> | 2020-10-31 07:14:18 -0400 |
|---|---|---|
| committer | John Thacker <johnthacker@gmail.com> | 2020-11-05 17:58:16 -0500 |
| commit | ac34f3e8b6ce12710c2b3a6750f5faa6fb16b739 (patch) | |
| tree | afcb2fec47df9184248f922630e48ef15660307f /.gitlab-ci.yml | |
| parent | 57b666692051969d874a5b272258b9f3d8447949 (diff) | |
RPM+CI: Update and fix for Fedora 33, CentOS 8, OpenSUSE Leap 15.2
Re-enable Fedora build and add CentOS 8 and OpenSUSE 15.2 builds.
Fedora 33 does out of build tree cmake builds and needs spec file changes.
CentOS 8 has some changes with cmake and other packages that are similar to
older Fedora, and needs extra repositories enabled to get -devel packages
(still missing -devel for some optional libraries). OpenSUSE Leap 15.2 also
has some changes needed to build. Note that OpenSUSE Leap 15.1 is EOL
at the end of November 2020. Fixes #16971
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 56 |
1 files changed, 50 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95a4a1728e..e633c26a65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,6 +78,32 @@ test:rpm-centos-7: - build:rpm-centos-7 variables: GIT_STRATEGY: none +build:rpm-centos-8: + <<: *build-rpm + image: centos:8 + script: + - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + - dnf -y install dnf-plugins-core + # PowerTools is the CentOS name for CodeReady, where -devel packages live + - dnf config-manager --enable PowerTools + # Devel is a CentOS repository with some extra -devel packages not (yet?) in RHEL + - dnf config-manager --enable Devel + - tools/rpm-setup.sh --install-optional -y + - mkdir build + - cd build + - cmake -GNinja .. + - ninja-build rpm-package +test:rpm-centos-8: + stage: test + image: centos:8 + script: + - dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + - dnf --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm + - tshark --version + dependencies: + - build:rpm-centos-8 + variables: + GIT_STRATEGY: none build:rpm-opensuse-15.1: image: opensuse/leap:15.1 <<: *build-rpm @@ -99,9 +125,28 @@ test:rpm-opensuse-15.1: GIT_STRATEGY: none dependencies: - build:rpm-opensuse-15.1 - -# Disabled for now due to issues with Fedora 33. -.build:rpm-fedora: +build:rpm-opensuse-15.2: + image: opensuse/leap:15.2 + <<: *build-rpm + script: + - zypper --non-interactive install update-desktop-files + - tools/rpm-setup.sh --install-optional ruby + - gem install asciidoctor -v 2.0.10 --no-ri --no-rdoc + - mkdir build + - cd build + - cmake -GNinja .. + - ninja rpm-package +test:rpm-opensuse-15.2: + image: opensuse/leap:15.2 + stage: test + script: + - zypper --no-gpg-checks install -y build/packaging/rpm/RPMS/x86_64/*.rpm + - tshark --version + variables: + GIT_STRATEGY: none + dependencies: + - build:rpm-opensuse-15.2 +build:rpm-fedora: <<: *build-rpm image: fedora script: @@ -110,9 +155,8 @@ test:rpm-opensuse-15.1: - mkdir build - cd build - cmake3 -GNinja .. - - ninja-build rpm-package - -.test:rpm-fedora: + - ninja rpm-package +test:rpm-fedora: image: fedora stage: test script: |