Commit Graph

246 Commits

Author SHA1 Message Date
Gerald Combs b51a66f4f1 GitLab CI: Fix our macOS Intel deployment target. 2022-08-17 22:53:58 +00:00
Gerald Combs e555b458de GitLab CI: Enable Qt6 for the macOS builds. 2022-08-17 13:33:55 -07:00
Gerald Combs 9445bda1d8 GitLab CI: Switch the macOS builds to Qt 6.2.4. 2022-08-17 18:46:09 +00:00
Gerald Combs 25bb87a781 GitLab CI: BUILD_logwolf → BUILD_logray. 2022-08-11 17:56:28 -07:00
Gerald Combs babb059f21 GitLab CI: Disable tests in the Debian package job. 2022-07-25 11:12:15 -07:00
Gerald Combs fa9703cb27 GitLab CI: Rocky 9 fixups.
The Ninja command is available as "ninja", so use that.

[skip ci]
2022-07-24 13:49:45 -07:00
Gerald Combs 34d30922eb GitLab CI: Switch to Rocky Linux 9.
Rocky Linux 9 includes a supported version of c-ares.
2022-07-23 17:02:48 -07:00
Balint Reczey 924076ed29 GitLab CI: Fix format of DEB_BUILD_OPTIONS passed to the Ubuntu build 2022-07-21 18:03:56 +00:00
Gerald Combs b91079d3a6 GitLab CI: Fixup our make-version calls.
Call make-version.py on Windows using py.exe. Call it directly on other
platforms.
2022-07-11 17:33:08 -05:00
Moshe Kaplan 87ca8c227a tools: Port make-version.pl to Python 2022-07-11 14:44:23 +00:00
Gerald Combs 022ebb106a GitLab CI: Fix our documentation globs
The correct glob pattern for a directory and its subdirectories is
"**/*". Use that in the change rules for the Documentation job.
2022-06-15 10:26:36 -07:00
Gerald Combs bbe6ab6316 CMake: Update WiX and PortableApps target names.
Rename the wix_package target to wireshark_wix and the
portableapps_package target to wireshark_portableapps.
2022-06-08 18:12:46 +00:00
Gerald Combs de1a4c3774 CMake: Update package target names.
Rename the rpm-package target to wireshark_rpm and the appimage target
to wireshark_appimage.
2022-06-08 17:56:21 +00:00
João Valverde c0bd7266ad Gitlab-CI: Add tfshark to code check job
Building tfshark is disabled by default in CMake options.

The tfshark code should be continuously tested or removed from the
main repo. It should not be allowed to exist in a broken state.

Add it to the code check job to make sure that it at least compiles.
2022-06-05 19:47:10 +00:00
Gerald Combs 056fd8a1e3 NSIS: Update some target and filenames.
Rename the following build targets, similar to the recent macOS target
name changes:

nsis_package_prep to wireshark_nsis_prep
nsis_package to wireshark_nsis

Rename some NSIS files to reflect that they're specific to Wireshark.
Update the documentation and CI configurations.
2022-06-02 16:33:31 -07:00
Gerald Combs 370c58f913 macOS: Add Logwolf packaging targets.
Rename the following build targets:

app_bundle to wireshark_app_bundle
dmg_package_prep to wireshark_dmg_prep
dmg_package to wireshark_dmg

Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and
packaging assets. Update the documentation.

We need to add a set of Logwolf version variables to CMake and
make-version.pl. Add a static logwolf-version attribute to
attributes.adoc in the mean time.
2022-05-26 20:29:20 +00:00
Gerald Combs f238dec118 GitLab CI: Switch the Windows packages to Qt 6.2.3.
Qt 6.2.4 has a serious display enumeration bug on Windows (QTBUG-101203).
Switch to 6.2.3.

Fixes #18091.
2022-05-16 09:44:02 -07:00
Martin Mathieson ca5b095b38 .gitlab-ci.yml: more checks from tools/check_typed_item_calls.py 2022-05-04 09:36:19 +00:00
Gerald Combs 925daf665c GitLab CI: Switch back to Clang 14. 2022-05-02 13:57:12 -07:00
Gerald Combs 7bccf9e2aa GitLab CI: Revert back to Clang 12.
Revert commits bc29ce61d5 and
3dd5ccbe7d in case Clang 14 is causing our
recent fuzz failures. Ping #18045.
2022-04-29 15:54:13 -07:00
Moshe Kaplan 7e04ea3202 .gitlab-ci.yml: Disable security-code-scan
Disable security-code-scan, a .NET scanner which
is not applicable to Wireshark.
2022-04-28 13:34:00 +00:00
Moshe Kaplan c3249701b5 .gitlab-ci.yml: Disable semgrep
Disable semgrep SAST scanner because it cannot properly
handle macros used in Wireshark dissectors and other code.
2022-04-27 00:26:18 +00:00
Gerald Combs 3dd5ccbe7d GitLab CI: Build the fuzz and "No Options" job without mmdbresolve.
Recent fuzz jobs are timing out, and it appears to be related to
mmdbresolve. Disable it, at least for now. Ping #18045.
2022-04-24 17:19:35 -07:00
Gerald Combs b491d28c42 GitLab CI+release notes: Remove 32-bit Windows.
Note that we no longer ship 32-bit Windows packages in the release
notes.

Remove our 32-bit Windows and CentOS 7 jobs.
2022-04-20 19:26:13 +00:00
Moshe Kaplan 8d6fbafe05 gitlab-ci: Add SAST 2022-04-19 12:52:05 +00:00
Gerald Combs bc29ce61d5 GitLab CI: Switch to clang 14. 2022-04-17 18:26:37 +00:00
Gerald Combs 37ccc2b0e5 GitLab CI: Build Logwolf in the Code Checks + Clang Warnings job. 2022-04-07 23:46:20 +00:00
Gerald Combs 629fc46ea1 GitLab CI: Add a Windows Qt5 MR job.
Add a "Windows Qt5 Build" job that builds the qtui target with Qt 5.
2022-03-27 14:19:53 +00:00
Gerald Combs 1d65574fc8 GitLab CI: Switch the 64-bit Windows builds to Qt 6. 2022-03-25 13:50:18 -07:00
Gerald Combs e39b9a2f80 CMake: Disable fuzzshark by default.
Most people don't use fuzzshark, so don't waste compute resources
building it. OSS-Fuzz has been updated to always build fuzzshark in
https://github.com/google/oss-fuzz/pull/7373
2022-03-11 17:35:49 +00:00
Gerald Combs c4f60981c1 GitLab CI: Copy our macOS dSYM .dmgs. 2022-03-05 17:04:36 -08:00
Gerald Combs 2ebefa4cc1 GitLab CI: Try to fix macOS Arm builds.
Don't specify CMAKE_OSX_SYSROOT, for now at least.
2022-02-22 15:52:33 -08:00
Gerald Combs 91f588ea6f GitLab CI: Remove `arch` commands.
GitLab Runner 14.8 added a native Arm binary for macOS. It's been
installed on our build machine, so the `arch` calls in the "macOS Arm
Package" job are no longer needed.
2022-02-22 14:10:30 -08:00
Gerald Combs 79da670bd1 Packaging+GitLab CI: Move debian to the packaging directory.
We keep our various packaging assets in the "packaging" directory. Move
the Debian assets there. dpkg-buildpackage doesn't seem appear to have a
"debian directory path" option, but symlinking worked in my test
container.
2022-02-13 13:21:58 -08:00
John Thacker 0729f96fdd GitLab CI: Fix Commit Check gitrevision for multiple commits
commit^N means the Nth parent of a commit object (after a merge,
for example.) It is not the same as the Nth generation ancestor
(following only the first parents), which is commit~N, or
alternatively commit^^^^^ (N times), or even commit^1^1^1....
(See 'man gitrevisions' for details.)
When the number of commits is N, we want the Nth generation ancestor.

Fixes error messages like:
fatal: ambiguous argument 'HEAD^3': unknown revision or path not
in the working tree.
2022-01-19 18:06:56 +00:00
Gerald Combs 5f19c5b6ef GitLab CI: Migrate to Visual Studio 2022.
Migrate the Windows builds to Visual Studio 2022.
2022-01-15 16:40:07 -08:00
Gerald Combs 947d80c477 GitLab CI: Swap the Ubuntu package and latest Clang builds.
The Ubuntu APT Package job takes a long time to run. Do so after merging
and add a package test job, similar to the other Linux package builds.
The Latest Clang job has been detecting errors that also affect macOS.
Run it for merge requests. Fix Ubuntu build caching.
2022-01-07 03:32:26 +00:00
Gerald Combs 734d8cfbee GitLab CI: Update a couple of RPM builds.
Switch from Centos 8 to Rocky Linux 8 and switch from openSUSE 15.2 to
15.3. Alphabetize our Linux jobs.
2022-01-06 04:18:44 +00:00
João Valverde 119473eab3 CMake: Use more consistent naming for options
Having some options use DISABLE_ and others ENABLE_ is inconsistent
and difficult to remember. Use ENABLE_ instead consistently.

Frame-larger-than remains an exception.
2022-01-03 15:55:06 +00:00
Dario Lombardo 1abc6bd3b1 ci: run checks on all the commits in the current MR.
Fix: #16813.
2021-12-29 22:11:48 +00:00
Gerald Combs 044c3a594b GitLab CI: Stop building 32-bit Windows Installer (.msi) packages.
The 32-bit Windows Installer / WiX / .msi packages make up a tiny
percentage of our downloads, and they take a non-trivial amount of time
to create. Stop building them. Ping #17779.
2021-12-29 18:19:11 +00:00
Gerald Combs a11f105e44 GitLab CI: Simplify our Windows paths.
CMake's FindPerl module and our FindNSIS and FindWiX modules can find
perl, makensis, and the various WiX utilities in their default locations
so we don't need to prepopulate our PATH.

Update FindWiX to look for version 3.11.
2021-12-22 20:33:29 +00:00
Gerald Combs c9715e5ab5 GitLab CI: Switch the Windows MR job back to vanilla CMake.
After switching to Visual Studio's CMake the Windows MR builds started
failing with

    C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppCommon.targets(241,5): error MSB8066: Custom build for 'C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_de.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_en.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_es.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_fr.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_it.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_ja_JP.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_pl.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_ru.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_sv.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_tr_TR.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_uk.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\7345cb0fc1b52560d4d2bd48e83ff433\wireshark_zh_CN.qm.rule;C:\builds\wireshark\wireshark\build\CMakeFiles\9829b32238fa3bcc807b02099e4c1642\qtui_autogen.rule' exited with code -1073741819. [C:\builds\wireshark\wireshark\build\ui\qt\qtui_autogen.vcxproj]

This appears to be caused by
https://gitlab.kitware.com/cmake/cmake/-/issues/22014 which should be
fixed in recent versions of the official CMake distribution.
2021-12-18 21:47:43 +00:00
Gerald Combs 271ab568b0 GitLab CI: Enable ccache in the "No options" job. 2021-12-17 18:53:53 +00:00
Gerald Combs f877e26b31 GitLab CI: Add back a missing variable. 2021-12-17 08:49:02 -08:00
Gerald Combs 07c4059277 GitLab CI+Qt+Docs: CMAKE_PREFIX_PATH updates.
Qt's documentation recommends using CMAKE_PREFIX_PATH to designate your
Qt installation prefix: https://doc.qt.io/qt-5/cmake-get-started.html.
Do so in GitLab's CI and update the Developer's Guide.
2021-12-16 18:47:18 -08:00
Gerald Combs 7d88f1e2b1 GitLab CI: More Windows environment updates.
Use Visual Studio's CMake in the MR build. Use CMAKE_PREFIX_PATH as
recommended by https://doc.qt.io/qt-5/cmake-get-started.html
2021-12-16 17:00:02 -08:00
Gerald Combs 476bf62494 GitLab CI: Remove a no-longer-needed build.
Remove the -DENABLE_PCAP=OFF build from the "macOS Arm Package" job.
It's no longer needed since we now have a "No options" job.
2021-12-16 22:51:47 +00:00
Dario Lombardo 1f7c4eff30
ci: add no options job.
Fix: #17786.
2021-12-16 22:54:21 +01:00
Gerald Combs 606bc27777 GitLab CI: Update our Windows environments.
Use Visual Studio's CMake where we can.
2021-12-15 18:51:20 -08:00