summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml42
1 files changed, 22 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd025492..67a5e645 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,7 +82,7 @@ variables:
.build-linux:
stage: build
tags:
- - docker
+ - saas-linux-small-amd64
before_script:
- printf "\e[0Ksection_start:%s:ci_env_section[collapsed=true]\r\e[0KCI environment variables" "$(date +%s)"
- env | grep ^CI | sort
@@ -96,7 +96,7 @@ variables:
.test-linux:
stage: test
tags:
- - docker
+ - saas-linux-small-amd64
variables:
GIT_STRATEGY: none
@@ -232,7 +232,7 @@ variables:
- cd build
script:
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
- - cmake -G Ninja -DENABLE_CCACHE=ON -DLUA_FIND_VERSIONS=ANY -DTEST_EXTRA_ARGS=--disable-capture ..
+ - cmake -G Ninja -DENABLE_CCACHE=ON -DTEST_EXTRA_ARGS=--disable-capture ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja
- ninja test-programs
@@ -262,6 +262,7 @@ Source Package:
- cp -v doc/release-notes.txt ../release-notes-${WIRESHARK_VERSION}.txt
after_script:
# - ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
+ - if [ "$CI_JOB_STATUS" != "success" ]; then exit 0 ; fi
- stat --format="%n %s bytes" wireshark-*.tar.*
- for digest in sha512 sha256 sha1 ; do openssl $digest wireshark-*.tar.* ; done
# This will break if we produce multiple tarballs, which is arguably a good thing.
@@ -345,7 +346,7 @@ Windows MinGW-w64 Package:
image: registry.gitlab.com/wireshark/wireshark-containers/mingw-dev
rules: !reference [.if-merged]
tags:
- - docker
+ - saas-linux-small-amd64
cache:
# XXX Use ${CI_JOB_NAME}-${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} instead?
key: ${CI_JOB_NAME}-release-4.2
@@ -372,22 +373,22 @@ Windows MinGW-w64 Package:
expire_in: 3 days
needs: []
-openSUSE 15.4 RPM Package:
+openSUSE 15.5 RPM Package:
extends: .build-rpm
- image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.4-dev
+ image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.5-dev
script:
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
- cmake -G Ninja -DUSE_qt6=OFF ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja wireshark_rpm
-openSUSE 15.4 RPM Test:
+openSUSE 15.5 RPM Test:
extends: .test-rpm
- image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.4-dev
+ image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.5-dev
script:
- zypper --no-gpg-checks --no-remote install -y build/packaging/rpm/RPMS/x86_64/*.rpm
- tshark --version
- needs: [ 'openSUSE 15.4 RPM Package' ]
+ needs: [ 'openSUSE 15.5 RPM Package' ]
Rocky Linux 9 RPM Package:
extends: .build-rpm
@@ -528,7 +529,7 @@ macOS Arm Package:
- wireshark-macos-arm-package
retry: 1
script:
- - export CMAKE_PREFIX_PATH=/usr/local/Qt-6.2.4
+ - export CMAKE_PREFIX_PATH="/usr/local/Qt-6.2.4:/usr/local/lua-5.2"
- export PATH="$PATH:$HOME/bin"
- mkdir build
- cd build
@@ -573,7 +574,7 @@ macOS Intel Package:
- wireshark-macos-intel-package
retry: 1
script:
- - export CMAKE_PREFIX_PATH=/usr/local/Qt-6.2.4
+ - export CMAKE_PREFIX_PATH="/usr/local/Qt-6.2.4:/usr/local/lua-5.2"
- export PATH="$PATH:$HOME/bin"
- mkdir build
- cd build
@@ -624,7 +625,7 @@ Documentation:
script:
# XXX We might want to move this to wireshark-ubuntu-dev or debian-setup.sh.
- DEBIAN_FRONTEND=noninteractive apt-get update
- - DEBIAN_FRONTEND=noninteractive apt-get --yes install ruby-coderay ruby-asciidoctor-pdf
+ - DEBIAN_FRONTEND=noninteractive apt-get --yes install ruby-asciidoctor-pdf ruby-coderay ruby-dev
- NOKOGIRI_USE_SYSTEM_LIBRARIES=1 gem install asciidoctor-epub3
- mkdir build
- cd build
@@ -633,16 +634,16 @@ Documentation:
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja all_guides
- cd docbook
- - for HTML_DIR in wsug_html wsug_html_chunked wsdg_html wsdg_html_chunked ; do zip -9 -r "$HTML_DIR.zip" "$HTML_DIR" ; done
- after_script:
- - mv -v build/docbook/ws[ud]g_html{,_chunked}.zip .
- - mv -v build/docbook/Wireshark*Guide.{epub,pdf} .
+ - for HTML_DIR in ws[ud]g_html{,_chunked} ; do zip -9 -r "$HTML_DIR.zip" "$HTML_DIR" ; done
- |
if [ -n "$S3_DESTINATION_DOCS" ] ; then
for DOC_FILE in ws[ud]g_html{,_chunked}.zip Wireshark*Guide.{epub,pdf} ; do
aws s3 cp "$DOC_FILE" "$S3_DESTINATION_DOCS/"
done
fi
+ - mv -v ws[ud]g_html{,_chunked}.zip Wireshark*Guide.{epub,pdf} ../..
+ after_script:
+ - if [ "$CI_JOB_STATUS" != "success" ]; then exit 0 ; fi
artifacts:
paths:
- wsug_html.zip
@@ -812,14 +813,14 @@ macOS Build:
- cmake -GNinja ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja wsar_html_zip 2>&1 > doxygen_output.txt | tee doxygen_errors.txt
- after_script:
- - mv build/wsar_html.zip .
- - mv build/doxygen_output.txt .
- - mv build/doxygen_errors.txt .
+ - mv wsar_html.zip doxygen_{output,errors}.txt ..
+ - cd ..
- |
if [ -n "$S3_DESTINATION_DOCS" ] ; then
aws s3 cp wsar_html.zip "$S3_DESTINATION_DOCS/"
fi
+ after_script:
+ - if [ "$CI_JOB_STATUS" != "success" ]; then exit 0 ; fi
artifacts:
paths:
- doxygen_errors.txt
@@ -856,6 +857,7 @@ macOS Build:
# The cache should be large enough to be useful but it shouldn't take
# too long to restore+save each run.
- ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
+ - if [ "$CI_JOB_STATUS" == "canceled" ]; then exit 0 ; fi
- . /tmp/fuzz_result.sh
- if $FUZZ_PASSED ; then exit 0 ; fi
- echo Fuzzing failed. Generating report.