From 9dcba0c68a3ee9608da319187f5a1b30def77c52 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 11 Mar 2020 22:18:21 +0000 Subject: [PATCH] gitlab-ci: print tshark --version for OpenSUSE and Debian Add missing output directory for Debian (obj-x86_64-linux-gnu). Restore a working LD_LIBRARY_PATH setting for OpenSUSE, this has never worked since v3.1.0rc0-590-gc77ee0008d. Change-Id: I4f2c2e4636e7dd0233e7f08a88ba3789b021f274 Reviewed-on: https://code.wireshark.org/review/36378 Reviewed-by: Peter Wu --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ab8500b6b..279b33b163 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,8 @@ .build: &build stage: build after_script: - - for builddir in build/packaging/rpm/BUILD/wireshark-*/build build/packaging/rpm/BUILD/wireshark-* build; do [ ! -d "$builddir" ] || 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 [ -f $builddir/run/tshark ]; then $builddir/run/tshark --version; fi # The custom Ubuntu image pre-installs dependencies and compilers to speed up the build: @@ -116,8 +117,8 @@ test:rpm-fedora: # Job to generate packages for Debian stable build:debian-stable: + <<: *build image: debian:stable - stage: build before_script: - ./tools/debian-setup.sh --install-optional --install-test-deps -y --install-deb-deps script: