From 33a8f5e7e65dc52b74b9acd811abc5049a39ba3c Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 14 Jan 2019 13:09:19 +0100 Subject: 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 --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6efbb9bc5b..4ba3e0608b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,6 @@ rpm-centos-7: - mkdir build - cd build - cmake3 -GNinja .. - - ninja-build - ninja-build rpm-package rpm-opensuse-42.3: image: opensuse:42.3 @@ -91,7 +90,6 @@ rpm-opensuse-42.3: - mkdir build - cd build - cmake .. - - make - make rpm-package rpm-fedora-28: image: fedora:28 @@ -101,7 +99,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 -- cgit v1.2.3