From f59ea5f7690c9a01ef6f7f6508084a66c40b1dae Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Apr 2024 19:44:25 +0200 Subject: Merging upstream version 4.2.4. Signed-off-by: Daniel Baumann --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6355be1..dd02549 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: -- cgit v1.2.3