summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:18 +0000
commit1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f (patch)
tree9930fb4bb87cd6037f60efff9656f967121c8c2d /.gitlab-ci.yml
parentAdding debian version 4.2.2-1.1. (diff)
downloadwireshark-1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f.tar.xz
wireshark-1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f.zip
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6355be13..dd025492 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,11 +215,14 @@ variables:
# it sets an alternate HOME, which results in asdf returning
# unknown command: python3. Perhaps you have to reshim?
# Make sure /usr/local/bin is first in order to work around asdf.
- - export PATH=/usr/local/bin:$PATH
+ - export PATH=/usr/local/bin:$PATH:$HOME/.python-env/bin
- brew --version
- printf "\e[0Ksection_start:%s:brew_section[collapsed=true]\r\e[0KInstalling prerequisites" "$( date +%s)"
- ./tools/macos-setup-brew.sh --install-optional --install-test-deps
- printf "\e[0Ksection_end:%s:brew_section\r\e[0K" "$( date +%s)"
+ # Homebrew implemented PEP 668, so install Python packages using venv for now.
+ - python3 -m venv $HOME/.python-env
+ - $HOME/.python-env/bin/pip3 install pytest pytest-xdist
- export PYTEST_ADDOPTS=--skip-missing-programs=dumpcap,rawshark
- mkdir -p ccache
- ccache --show-stats
@@ -271,6 +274,8 @@ Source Package:
artifacts:
paths:
- wireshark-*.tar.*
+ - release-notes-*.html
+ - release-notes-*.txt
# Job to generate packages for Debian stable
Debian Stable APT Package: