forked from osmocom/wireshark
gitlab-ci: reuse tarball from ubuntu-dist in rpm.
This commit is contained in:
parent
6b0f2ead7a
commit
07c2439714
|
@ -20,6 +20,7 @@ variables:
|
||||||
- for builddir in build/packaging/rpm/BUILD/wireshark-*/build build/packaging/rpm/BUILD/wireshark-* build obj-*; do [ ! -d "$builddir/run" ] || break; done
|
- for builddir in build/packaging/rpm/BUILD/wireshark-*/build build/packaging/rpm/BUILD/wireshark-* build obj-*; do [ ! -d "$builddir/run" ] || break; done
|
||||||
- if [[ "$CI_JOB_NAME" == "build:rpm-opensuse-"* ]]; then export LD_LIBRARY_PATH=$builddir/run; fi
|
- if [[ "$CI_JOB_NAME" == "build:rpm-opensuse-"* ]]; then export LD_LIBRARY_PATH=$builddir/run; fi
|
||||||
- if [ -f $builddir/run/tshark ]; then $builddir/run/tshark --version; fi
|
- if [ -f $builddir/run/tshark ]; then $builddir/run/tshark --version; fi
|
||||||
|
needs: []
|
||||||
|
|
||||||
.build-ubuntu:
|
.build-ubuntu:
|
||||||
extends: .build
|
extends: .build
|
||||||
|
@ -60,6 +61,12 @@ variables:
|
||||||
|
|
||||||
.build-rpm:
|
.build-rpm:
|
||||||
extends: .build
|
extends: .build
|
||||||
|
before_script:
|
||||||
|
- git config --global user.email "you@example.com"
|
||||||
|
- git config --global user.name "Your Name"
|
||||||
|
- mkdir build
|
||||||
|
- cd build
|
||||||
|
- perl ../tools/make-version.pl --set-release
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- build/packaging/rpm/RPMS
|
- build/packaging/rpm/RPMS
|
||||||
|
@ -73,6 +80,7 @@ clang-11:
|
||||||
CXX: clang++-11
|
CXX: clang++-11
|
||||||
|
|
||||||
build:ubuntu-dist:
|
build:ubuntu-dist:
|
||||||
|
stage: .pre
|
||||||
extends: .build-ubuntu
|
extends: .build-ubuntu
|
||||||
script:
|
script:
|
||||||
- perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
|
- perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
|
||||||
|
@ -95,17 +103,17 @@ build:rpm-centos-7:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-centos-7-dev
|
image: wireshark/wireshark-centos-7-dev
|
||||||
script:
|
script:
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- cmake3 -GNinja ..
|
- cmake3 -GNinja ..
|
||||||
- ninja-build rpm-package
|
- ninja-build rpm-package
|
||||||
|
needs:
|
||||||
|
- build:ubuntu-dist
|
||||||
test:rpm-centos-7:
|
test:rpm-centos-7:
|
||||||
stage: test
|
stage: test
|
||||||
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:
|
needs:
|
||||||
- build:rpm-centos-7
|
- build:rpm-centos-7
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
|
@ -114,17 +122,17 @@ build:rpm-centos-8:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-centos-8-dev
|
image: wireshark/wireshark-centos-8-dev
|
||||||
script:
|
script:
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja ..
|
||||||
- ninja-build rpm-package
|
- ninja-build rpm-package
|
||||||
|
needs:
|
||||||
|
- build:ubuntu-dist
|
||||||
test:rpm-centos-8:
|
test:rpm-centos-8:
|
||||||
stage: test
|
stage: test
|
||||||
image: wireshark/wireshark-centos-8-dev
|
image: wireshark/wireshark-centos-8-dev
|
||||||
script:
|
script:
|
||||||
- dnf --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
- dnf --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm
|
||||||
- tshark --version
|
- tshark --version
|
||||||
dependencies:
|
needs:
|
||||||
- build:rpm-centos-8
|
- build:rpm-centos-8
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
|
@ -133,10 +141,10 @@ build:rpm-opensuse-15.1:
|
||||||
image: wireshark/wireshark-opensuse-15.1-dev
|
image: wireshark/wireshark-opensuse-15.1-dev
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
script:
|
script:
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja ..
|
||||||
- ninja rpm-package
|
- ninja rpm-package
|
||||||
|
needs:
|
||||||
|
- build:ubuntu-dist
|
||||||
test:rpm-opensuse-15.1:
|
test:rpm-opensuse-15.1:
|
||||||
image: wireshark/wireshark-opensuse-15.1-dev
|
image: wireshark/wireshark-opensuse-15.1-dev
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -145,17 +153,17 @@ test:rpm-opensuse-15.1:
|
||||||
- tshark --version
|
- tshark --version
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
dependencies:
|
needs:
|
||||||
- build:rpm-opensuse-15.1
|
- build:rpm-opensuse-15.1
|
||||||
|
|
||||||
build:rpm-opensuse-15.2:
|
build:rpm-opensuse-15.2:
|
||||||
image: wireshark/wireshark-opensuse-15.2-dev
|
image: wireshark/wireshark-opensuse-15.2-dev
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
script:
|
script:
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja ..
|
||||||
- ninja rpm-package
|
- ninja rpm-package
|
||||||
|
needs:
|
||||||
|
- build:ubuntu-dist
|
||||||
test:rpm-opensuse-15.2:
|
test:rpm-opensuse-15.2:
|
||||||
image: wireshark/wireshark-opensuse-15.2-dev
|
image: wireshark/wireshark-opensuse-15.2-dev
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -164,17 +172,17 @@ test:rpm-opensuse-15.2:
|
||||||
- tshark --version
|
- tshark --version
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
dependencies:
|
needs:
|
||||||
- build:rpm-opensuse-15.2
|
- build:rpm-opensuse-15.2
|
||||||
|
|
||||||
build:rpm-fedora:
|
build:rpm-fedora:
|
||||||
extends: .build-rpm
|
extends: .build-rpm
|
||||||
image: wireshark/wireshark-fedora-dev
|
image: wireshark/wireshark-fedora-dev
|
||||||
script:
|
script:
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- cmake3 -GNinja ..
|
- cmake3 -GNinja ..
|
||||||
- ninja rpm-package
|
- ninja rpm-package
|
||||||
|
needs:
|
||||||
|
- build:ubuntu-dist
|
||||||
test:rpm-fedora:
|
test:rpm-fedora:
|
||||||
image: fedora
|
image: fedora
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -183,7 +191,7 @@ test:rpm-fedora:
|
||||||
- tshark --version
|
- tshark --version
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
dependencies:
|
needs:
|
||||||
- build:rpm-fedora
|
- build:rpm-fedora
|
||||||
|
|
||||||
# Job to generate packages for Debian stable
|
# Job to generate packages for Debian stable
|
||||||
|
@ -208,7 +216,7 @@ test:debian-stable:
|
||||||
- tshark --version
|
- tshark --version
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
dependencies:
|
needs:
|
||||||
- build:debian-stable
|
- build:debian-stable
|
||||||
|
|
||||||
# Build Wireshark manuals
|
# Build Wireshark manuals
|
||||||
|
@ -236,6 +244,7 @@ docbook:
|
||||||
- wsug_html_chunked/
|
- wsug_html_chunked/
|
||||||
- wsdg_html/
|
- wsdg_html/
|
||||||
- wsdg_html_chunked/
|
- wsdg_html_chunked/
|
||||||
|
needs: []
|
||||||
|
|
||||||
|
|
||||||
# Build all doxygen docs
|
# Build all doxygen docs
|
||||||
|
@ -257,6 +266,7 @@ doxygen_all:
|
||||||
- doxygen_errors.txt
|
- doxygen_errors.txt
|
||||||
- doxygen_output.txt
|
- doxygen_output.txt
|
||||||
- wsar_html
|
- wsar_html
|
||||||
|
needs: []
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue