Gitlab CI: Fix ubuntu/rpm builds using Qt5
This commit is contained in:
parent
21d93f072a
commit
9aa8331467
|
@ -258,7 +258,7 @@ openSUSE 15.3 RPM Package:
|
||||||
image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.3-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/opensuse-15.3-dev
|
||||||
script:
|
script:
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja wireshark_rpm
|
- ninja wireshark_rpm
|
||||||
openSUSE 15.3 RPM Test:
|
openSUSE 15.3 RPM Test:
|
||||||
|
@ -274,7 +274,7 @@ Rocky Linux 9 RPM Package:
|
||||||
image: registry.gitlab.com/wireshark/wireshark-containers/rockylinux-9-dev
|
image: registry.gitlab.com/wireshark/wireshark-containers/rockylinux-9-dev
|
||||||
script:
|
script:
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja wireshark_rpm
|
- ninja wireshark_rpm
|
||||||
Rocky Linux 9 RPM Test:
|
Rocky Linux 9 RPM Test:
|
||||||
|
@ -448,7 +448,7 @@ Documentation:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja all_guides
|
- ninja all_guides
|
||||||
- cd docbook
|
- cd docbook
|
||||||
|
@ -605,7 +605,7 @@ Coverity GCC Scan:
|
||||||
- tar --directory=/tmp --extract --gzip --file /tmp/cov-analysis-linux64.tar.gz
|
- tar --directory=/tmp --extract --gzip --file /tmp/cov-analysis-linux64.tar.gz
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- cmake -G Ninja ..
|
- cmake -G Ninja -DUSE_qt6=OFF ..
|
||||||
- /tmp/cov-analysis-linux64-*/bin/cov-build --return-emit-failures --dir ../cov-int ninja
|
- /tmp/cov-analysis-linux64-*/bin/cov-build --return-emit-failures --dir ../cov-int ninja
|
||||||
- cd ..
|
- cd ..
|
||||||
- tar --create --gzip --file cov-int.tar.gz cov-int
|
- tar --create --gzip --file cov-int.tar.gz cov-int
|
||||||
|
@ -708,7 +708,7 @@ API Reference:
|
||||||
rules: !reference [.if-daily-schedule]
|
rules: !reference [.if-daily-schedule]
|
||||||
script:
|
script:
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -GNinja ..
|
- cmake -GNinja -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- 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
|
- ninja wsar_html_zip 2>&1 > doxygen_output.txt | tee doxygen_errors.txt
|
||||||
after_script:
|
after_script:
|
||||||
|
@ -746,7 +746,7 @@ Code Lines:
|
||||||
- tar -xf tokei-x86_64-unknown-linux-gnu.tar.gz
|
- tar -xf tokei-x86_64-unknown-linux-gnu.tar.gz
|
||||||
- popd
|
- popd
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -G Ninja ..
|
- cmake -G Ninja -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja
|
- ninja
|
||||||
- cd ..
|
- cd ..
|
||||||
|
@ -813,7 +813,7 @@ ASan Menagerie Fuzz:
|
||||||
script:
|
script:
|
||||||
- MAX_SECONDS=$(( 4 * 60 * 60 ))
|
- MAX_SECONDS=$(( 4 * 60 * 60 ))
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
|
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja
|
- ninja
|
||||||
- ninja install
|
- ninja install
|
||||||
|
@ -828,7 +828,7 @@ ASan randpkt Fuzz:
|
||||||
script:
|
script:
|
||||||
# XXX Reuse fuzz-asan?
|
# XXX Reuse fuzz-asan?
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
|
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja
|
- ninja
|
||||||
- ninja install
|
- ninja install
|
||||||
|
@ -844,7 +844,7 @@ Valgrind Menagerie Fuzz:
|
||||||
- DEBIAN_FRONTEND=noninteractive apt-get --yes install valgrind
|
- DEBIAN_FRONTEND=noninteractive apt-get --yes install valgrind
|
||||||
- MAX_SECONDS=$(( 3 * 60 * 60 ))
|
- MAX_SECONDS=$(( 3 * 60 * 60 ))
|
||||||
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
|
||||||
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
|
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON -DUSE_qt6=OFF ..
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja
|
- ninja
|
||||||
- ninja install
|
- ninja install
|
||||||
|
|
Loading…
Reference in New Issue