forked from osmocom/wireshark
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 <peter@lekensteyn.nl>
This commit is contained in:
parent
f9af3ec4d5
commit
9dcba0c68a
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue