Wireshark-commits: [Wireshark-commits] master-2.6 104975f: gitlab-ci: do not build the all target w
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 14 Jan 2019 21:48:43 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=104975f1fe22f981df623b9b25a05bd86e4999e7
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

104975f by Peter Wu (peter@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    (cherry picked from commit 33a8f5e7e65dc52b74b9acd811abc5049a39ba3c)
    Reviewed-on: https://code.wireshark.org/review/31548
    

Actions performed:

    from  d86467a   RPM: remove dependency on the which utility
     add  104975f   gitlab-ci: do not build the all target when invoking rpm-package


Summary of changes:
 .gitlab-ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)