diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-01-14 13:09:19 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-01-14 21:48:39 +0000 |
| commit | 104975f1fe22f981df623b9b25a05bd86e4999e7 (patch) | |
| tree | 353487732d4c24a516387610a686e8184bb4bb2f | |
| parent | d86467afc3f4e7ed0df051be41ac9d65a8a3bca1 (diff) | |
| download | wireshark-104975f1fe22f981df623b9b25a05bd86e4999e7.tar.gz wireshark-104975f1fe22f981df623b9b25a05bd86e4999e7.tar.bz2 wireshark-104975f1fe22f981df623b9b25a05bd86e4999e7.zip | |
gitlab-ci: do not build the all target when invoking rpm-package
It doubles the build time for little benefit as rpm-package will
essentially build the same binaries again.
Adjust the "tshark --version" invocation, besides "build" (normal
build), also look in "build/packaging/rpm/BUILD/wireshark-*/build"
(OpenSUSE) and "build/packaging/rpm/BUILD/wireshark-*" (CentOS).
rpmbuild from OpenSUSE sets -DCMAKE_SKIP_RPATH=ON, as a workaround set
LD_LIBRARY_PATH to ensure that tshark can find its libraries.
Change-Id: I5ce8b97515516adbbba2f1e445a9dd1abf08d530
Reviewed-on: https://code.wireshark.org/review/31541
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
(cherry picked from commit 33a8f5e7e65dc52b74b9acd811abc5049a39ba3c)
Reviewed-on: https://code.wireshark.org/review/31548
| -rw-r--r-- | .gitlab-ci.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fbbee36c2..94582468cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,7 +116,6 @@ rpm-centos-7: - mkdir build - cd build - cmake3 -GNinja .. - - ninja-build - ninja-build rpm-package rpm-opensuse-42.3: image: opensuse:42.3 @@ -127,7 +126,6 @@ rpm-opensuse-42.3: - mkdir build - cd build - cmake .. - - make - make rpm-package rpm-fedora-28: image: fedora:28 @@ -137,7 +135,8 @@ rpm-fedora-28: - mkdir build - cd build - cmake3 -GNinja .. - - ninja-build - ninja-build rpm-package after_script: - - if [ -f build/run/tshark ];then build/run/tshark --version; fi + - for builddir in build/packaging/rpm/BUILD/wireshark-*/build build/packaging/rpm/BUILD/wireshark-* build; do [ ! -d "$builddir" ] || break; done + - if [ "$CI_JOB_NAME" = "rpm-opensuse-42.3" ]; then export LD_LIBRARY_PATH=$builddir/run; fi + - if [ -f $builddir/run/tshark ]; then $builddir/run/tshark --version; fi |