forked from osmocom/wireshark
GitLab CI: Give our jobs proper names.
GitLab's job YAML parser allows spaces in key names and our jobs are visible in the web UI, so give them proper names.
This commit is contained in:
parent
c1cf92283c
commit
66cba93e39
|
@ -97,7 +97,7 @@ variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
|
|
||||||
# Rely on fedora:latest and debian-stable jobs for testing a recent GCC version.
|
# Rely on fedora:latest and debian-stable jobs for testing a recent GCC version.
|
||||||
clang-10:
|
Clang 10:
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-merged]
|
||||||
variables:
|
variables:
|
||||||
|
@ -109,8 +109,7 @@ clang-10:
|
||||||
paths:
|
paths:
|
||||||
- dfilter-list-*.txt
|
- dfilter-list-*.txt
|
||||||
|
|
||||||
|
Source Package:
|
||||||
build:ubuntu-dist:
|
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-merged]
|
||||||
script:
|
script:
|
||||||
|
@ -127,7 +126,7 @@ build:ubuntu-dist:
|
||||||
paths:
|
paths:
|
||||||
- wireshark-*.tar.*
|
- wireshark-*.tar.*
|
||||||
|
|
||||||
build:rpm-centos-7:
|
CentOS 7 RPM Package:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-centos-7-dev
|
image: wireshark/wireshark-centos-7-dev
|
||||||
script:
|
script:
|
||||||
|
@ -135,16 +134,15 @@ build:rpm-centos-7:
|
||||||
- cd build
|
- cd build
|
||||||
- cmake3 -GNinja ..
|
- cmake3 -GNinja ..
|
||||||
- ninja-build rpm-package
|
- ninja-build rpm-package
|
||||||
test:rpm-centos-7:
|
CentOS 7 RPM Test:
|
||||||
extends: .test-rpm
|
extends: .test-rpm
|
||||||
image: wireshark/wireshark-centos-7-dev
|
image: wireshark/wireshark-centos-7-dev
|
||||||
script:
|
script:
|
||||||
- yum --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
- yum --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||||
- tshark --version
|
- tshark --version
|
||||||
dependencies:
|
dependencies: [ 'CentOS 7 RPM Package' ]
|
||||||
- build:rpm-centos-7
|
|
||||||
|
|
||||||
build:rpm-opensuse-15.1:
|
openSUSE 15.1 RPM Package:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-opensuse-15.1-dev
|
image: wireshark/wireshark-opensuse-15.1-dev
|
||||||
script:
|
script:
|
||||||
|
@ -152,17 +150,16 @@ build:rpm-opensuse-15.1:
|
||||||
- cd build
|
- cd build
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja ..
|
||||||
- ninja rpm-package
|
- ninja rpm-package
|
||||||
test:rpm-opensuse-15.1:
|
openSUSE 15.1 RPM Test:
|
||||||
extends: .test-rpm
|
extends: .test-rpm
|
||||||
image: wireshark/wireshark-opensuse-15.1-dev
|
image: wireshark/wireshark-opensuse-15.1-dev
|
||||||
script:
|
script:
|
||||||
- zypper --no-gpg-checks install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
- zypper --no-gpg-checks install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||||
- tshark --version
|
- tshark --version
|
||||||
dependencies:
|
dependencies: [ 'openSUSE 15.1 RPM Package' ]
|
||||||
- build:rpm-opensuse-15.1
|
|
||||||
|
|
||||||
# Disabled for now due to issues with Fedora 33.
|
# Disabled for now due to issues with Fedora 33.
|
||||||
.build:rpm-fedora:
|
.Fedora RPM Package:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-fedora-dev
|
image: wireshark/wireshark-fedora-dev
|
||||||
script:
|
script:
|
||||||
|
@ -171,17 +168,16 @@ test:rpm-opensuse-15.1:
|
||||||
- cmake3 -GNinja ..
|
- cmake3 -GNinja ..
|
||||||
- ninja-build rpm-package
|
- ninja-build rpm-package
|
||||||
|
|
||||||
# .test:rpm-fedora:
|
# .Fedora RPM Test:
|
||||||
# extends: .test-rpm
|
# extends: .test-rpm
|
||||||
# image: fedora
|
# image: fedora
|
||||||
# script:
|
# script:
|
||||||
# - dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
# - dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||||
# - tshark --version
|
# - tshark --version
|
||||||
# dependencies:
|
# dependencies: [ 'Fedora RPM Package' ]
|
||||||
# - build:rpm-fedora
|
|
||||||
|
|
||||||
# Job to generate packages for Debian stable
|
# Job to generate packages for Debian stable
|
||||||
build:debian-stable:
|
Debian Stable APT Package:
|
||||||
extends: .build
|
extends: .build
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-merged]
|
||||||
image: wireshark/wireshark-debian-stable-dev
|
image: wireshark/wireshark-debian-stable-dev
|
||||||
|
@ -197,7 +193,7 @@ build:debian-stable:
|
||||||
paths:
|
paths:
|
||||||
- debian-packages/*.deb
|
- debian-packages/*.deb
|
||||||
expire_in: 3 days
|
expire_in: 3 days
|
||||||
test:debian-stable:
|
Debian Stable APT Test:
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-merged]
|
||||||
image: wireshark/wireshark-debian-stable-dev
|
image: wireshark/wireshark-debian-stable-dev
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -206,12 +202,11 @@ test:debian-stable:
|
||||||
- tshark --version
|
- tshark --version
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
dependencies:
|
dependencies: [ 'Debian Stable APT Package' ]
|
||||||
- build:debian-stable
|
|
||||||
|
|
||||||
# Build Wireshark manuals
|
# Build Wireshark manuals
|
||||||
# Note: Need ubuntu:focal with `ruby-coderay` and `ruby-asciidoctor-pdf` packages to build PDF docs
|
# Note: Need ubuntu:focal with `ruby-coderay` and `ruby-asciidoctor-pdf` packages to build PDF docs
|
||||||
documentation:
|
Documentation:
|
||||||
stage: build
|
stage: build
|
||||||
image: wireshark/wireshark-ubuntu-dev
|
image: wireshark/wireshark-ubuntu-dev
|
||||||
rules:
|
rules:
|
||||||
|
@ -242,7 +237,7 @@ documentation:
|
||||||
|
|
||||||
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#linux-shared-runners
|
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#linux-shared-runners
|
||||||
|
|
||||||
merge-req:commit-checks:
|
Commit Checks:
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
rules: !reference [.if-merge-request]
|
rules: !reference [.if-merge-request]
|
||||||
tags:
|
tags:
|
||||||
|
@ -253,7 +248,7 @@ merge-req:commit-checks:
|
||||||
- bash ./tools/pre-commit 'HEAD^1'
|
- bash ./tools/pre-commit 'HEAD^1'
|
||||||
- tools/validate-commit.py
|
- tools/validate-commit.py
|
||||||
|
|
||||||
merge-req:ubuntu-dpkg:
|
Ubuntu .dpkg:
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
rules: !reference [.if-merge-request]
|
rules: !reference [.if-merge-request]
|
||||||
tags:
|
tags:
|
||||||
|
@ -264,7 +259,7 @@ merge-req:ubuntu-dpkg:
|
||||||
- CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
|
- CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
|
||||||
- lintian --suppress-tags library-not-linked-against-libc,copyright-excludes-files-in-native-package --display-experimental --display-info --pedantic --profile debian
|
- lintian --suppress-tags library-not-linked-against-libc,copyright-excludes-files-in-native-package --display-experimental --display-info --pedantic --profile debian
|
||||||
|
|
||||||
merge-req:ubuntu-gcc-ctest:
|
GCC Warnings:
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
rules: !reference [.if-merge-request]
|
rules: !reference [.if-merge-request]
|
||||||
tags:
|
tags:
|
||||||
|
@ -278,7 +273,7 @@ merge-req:ubuntu-gcc-ctest:
|
||||||
- chown -R user .
|
- chown -R user .
|
||||||
- su user -c "ctest --parallel 3 --force-new-ctest-process --verbose"
|
- su user -c "ctest --parallel 3 --force-new-ctest-process --verbose"
|
||||||
|
|
||||||
merge-req:ubuntu-clang-other-tests:
|
Code Checks + Clang Warnings:
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
rules: !reference [.if-merge-request]
|
rules: !reference [.if-merge-request]
|
||||||
tags:
|
tags:
|
||||||
|
@ -308,7 +303,7 @@ merge-req:ubuntu-clang-other-tests:
|
||||||
# Dockerfile at https://github.com/wireshark/wireshark-windows-dev-docker.
|
# Dockerfile at https://github.com/wireshark/wireshark-windows-dev-docker.
|
||||||
# XXX We currently depend on Qt being installed in C:\Qt on the host. We should
|
# XXX We currently depend on Qt being installed in C:\Qt on the host. We should
|
||||||
# find a more independent way of installing Qt, e.g. via a download+cache.
|
# find a more independent way of installing Qt, e.g. via a download+cache.
|
||||||
merge-req:windows:
|
Windows Build:
|
||||||
rules: !reference [.if-attached-merge-request]
|
rules: !reference [.if-attached-merge-request]
|
||||||
tags:
|
tags:
|
||||||
- wireshark-windows-merge-req
|
- wireshark-windows-merge-req
|
||||||
|
|
Loading…
Reference in New Issue