forked from osmocom/wireshark
GitLab CI: Switch all Linux builds to our container registry.
Switch all of the remaining Linux builds to registry.gitlab.com/wireshark/wireshark-containers/
This commit is contained in:
parent
f9279ddaea
commit
436dd46720
|
@ -4,10 +4,6 @@
|
||||||
# https://gitlab.com/wireshark/wireshark-containers/ instead.
|
# https://gitlab.com/wireshark/wireshark-containers/ instead.
|
||||||
# The resulting images can be found at
|
# The resulting images can be found at
|
||||||
# https://gitlab.com/wireshark/wireshark-containers/container_registry
|
# https://gitlab.com/wireshark/wireshark-containers/container_registry
|
||||||
# https://hub.docker.com/r/wireshark/wireshark-centos-7-dev
|
|
||||||
# https://hub.docker.com/r/wireshark/wireshark-debian-stable-dev
|
|
||||||
# https://hub.docker.com/r/wireshark/wireshark-fedora-dev
|
|
||||||
# https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
@ -96,7 +92,7 @@ variables:
|
||||||
|
|
||||||
.build-ubuntu:
|
.build-ubuntu:
|
||||||
extends: .build-linux
|
extends: .build-linux
|
||||||
image: wireshark/wireshark-ubuntu-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/ubuntu-dev
|
||||||
retry: 1
|
retry: 1
|
||||||
# https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
|
# https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
|
||||||
cache:
|
cache:
|
||||||
|
@ -210,12 +206,9 @@ Source Package:
|
||||||
paths:
|
paths:
|
||||||
- wireshark-*.tar.*
|
- wireshark-*.tar.*
|
||||||
|
|
||||||
# The custom CentOS 7 image pre-installs dependencies and compilers to speed up the build:
|
|
||||||
# https://hub.docker.com/r/wireshark/wireshark-centos-7-dev
|
|
||||||
# https://gitlab.com/wireshark/wireshark-containers/-/tree/master/dev/centos-7
|
|
||||||
CentOS 7 RPM Package:
|
CentOS 7 RPM Package:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-centos-7-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/centos-7-dev
|
||||||
script:
|
script:
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake3 -GNinja ..
|
- cmake3 -GNinja ..
|
||||||
|
@ -223,7 +216,7 @@ CentOS 7 RPM Package:
|
||||||
- ninja-build rpm-package
|
- ninja-build rpm-package
|
||||||
CentOS 7 RPM Test:
|
CentOS 7 RPM Test:
|
||||||
extends: .test-rpm
|
extends: .test-rpm
|
||||||
image: wireshark/wireshark-centos-7-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/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
|
||||||
|
@ -263,7 +256,7 @@ openSUSE 15.2 RPM Test:
|
||||||
|
|
||||||
Fedora RPM Package:
|
Fedora RPM Package:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-fedora-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/fedora-dev
|
||||||
script:
|
script:
|
||||||
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
||||||
# https://gitlab.com/gitlab-com/support-forum/issues/2790
|
# https://gitlab.com/gitlab-com/support-forum/issues/2790
|
||||||
|
@ -284,7 +277,7 @@ Fedora RPM Package:
|
||||||
Debian Stable APT Package:
|
Debian Stable APT Package:
|
||||||
extends: .build-linux
|
extends: .build-linux
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-merged]
|
||||||
image: wireshark/wireshark-debian-stable-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/debian-stable-dev
|
||||||
script:
|
script:
|
||||||
- perl tools/make-version.pl --set-release
|
- perl tools/make-version.pl --set-release
|
||||||
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
||||||
|
@ -301,7 +294,7 @@ Debian Stable APT Package:
|
||||||
Debian Stable APT Test:
|
Debian Stable APT Test:
|
||||||
extends: .test-linux
|
extends: .test-linux
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-merged]
|
||||||
image: wireshark/wireshark-debian-stable-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/debian-stable-dev
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- DEBIAN_FRONTEND=noninteractive apt-get install ./debian-packages/*.deb -y
|
- DEBIAN_FRONTEND=noninteractive apt-get install ./debian-packages/*.deb -y
|
||||||
|
@ -451,7 +444,7 @@ macOS Arm Package:
|
||||||
# Build the User's Guide and Developer's Guide
|
# Build the User's Guide and Developer's Guide
|
||||||
Documentation:
|
Documentation:
|
||||||
extends: .build-linux
|
extends: .build-linux
|
||||||
image: wireshark/wireshark-ubuntu-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/ubuntu-dev
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
|
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||||
changes:
|
changes:
|
||||||
|
@ -594,7 +587,7 @@ Windows Build:
|
||||||
# Adapted from https://www.synopsys.com/blogs/software-security/integrating-coverity-scan-with-gitlab-ci/
|
# Adapted from https://www.synopsys.com/blogs/software-security/integrating-coverity-scan-with-gitlab-ci/
|
||||||
# and https://gitlab.gnome.org/GNOME/glib/-/blob/8f57a5b9/.gitlab-ci.yml#L481
|
# and https://gitlab.gnome.org/GNOME/glib/-/blob/8f57a5b9/.gitlab-ci.yml#L481
|
||||||
Coverity GCC Scan:
|
Coverity GCC Scan:
|
||||||
image: wireshark/wireshark-ubuntu-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/ubuntu-dev
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "coverity-gcc"'
|
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "coverity-gcc"'
|
||||||
when: always
|
when: always
|
||||||
|
|
Loading…
Reference in New Issue