aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@zing.org>2021-06-02 12:48:56 -0700
committerGerald Combs <gerald@zing.org>2021-06-02 13:05:21 -0700
commit17a3789ad8e44b6e97f0fd8bfcd1ef72a3055da6 (patch)
tree58cfec3314cef41caaccc4a1a8a58ef771b243aa
parentfd6a83dfec6da062401d9277619a48f6f29535ed (diff)
GitLab CI: Move dfilter list generation.
Create the display filter list in the APT Test step.
-rw-r--r--.gitlab-ci.yml14
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' ]