diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aeb4f4e2a..89c61e5aa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ variables: - cd build script: # setcap restricts our library paths - - CFLAGS=-Wl,-rpath=$(pwd)/run CXXFLAGS=-Wl,-rpath=$(pwd)/run cmake -GNinja $CMAKE_ARGS .. + - CFLAGS=-Wl,-rpath=$(pwd)/run CXXFLAGS=-Wl,-rpath=$(pwd)/run cmake -GNinja -DENABLE_CCACHE=ON .. - ninja - ninja test-programs - chown -R user . @@ -116,11 +116,6 @@ Clang 10: variables: CC: "clang-$CLANG_VERSION" CXX: "clang++-$CLANG_VERSION" - after_script: - - build/run/tshark -G fields > dfilter-list-$( git describe --match "v*" | sed -e 's/^v//' ).txt - artifacts: - paths: - - dfilter-list-*.txt Source Package: extends: .build-ubuntu @@ -213,6 +208,13 @@ Debian Stable APT Test: script: - DEBIAN_FRONTEND=noninteractive apt-get install ./debian-packages/*.deb -y - tshark --version + after_script: + # Used for https://www.wireshark.org/docs/dfref/ + - TSHARK_VERSION=$( tshark --version | head -n 1 | sed -e 's/.*(v//' -e 's/)$//' ) + - tshark -G fields > dfilter-list-${TSHARK_VERSION}.txt + artifacts: + paths: + - dfilter-list-*.txt variables: GIT_STRATEGY: none dependencies: [ 'Debian Stable APT Package' ] |