Commit Graph

281 Commits

Author SHA1 Message Date
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
Gerald Combs b62197c283 CMake+GitLab CI: Reduce verbosity.
For various commands, make sure we show warnings and errors, but not
other extraneous information such as filenames.
2021-12-11 13:57:29 -08:00
Gerald Combs 7736e69b57 GitLab CI: Simplify some checks.
Assume that we have sufficient AWS credentials if our S3 destination
environment variable is set.
2021-12-11 09:33:52 -08:00
Gerald Combs 5005a696e4 GitLab CI: Bump our minimum macOS Intel version. 2021-11-15 15:59:51 -08:00
Gerald Combs 4105d78681 GitLab CI: Switch the macOS Intel build to Qt 5.15.3. 2021-11-15 15:31:52 -08:00
Gerald Combs 24b8942a90 GitLab CI+tools: Fuzz test updates.
Make sure we install the llvm package, which includes llvm-symbolizer.
Add the current branch and CI job information to the error report.
2021-10-28 11:20:25 -07:00
Gerald Combs fef8082364 GitLab CI: Move the Lintian check.
Move the Lintian check from the Ubuntu .dpkg job to the Debian package
job. This should reduce the time it takes to build merge request
pipelines a little bit.
2021-10-25 04:10:29 +00:00
Gerald Combs f2ec793131 Revert "GitLab CI: Switch to clang 13."
This reverts commit 0aae44e145.

The fuzz builder has been running out of memory since the switch to
Clang 13, so revert back to 12 for now.
2021-10-18 19:07:12 +00:00
Gerald Combs 6299a66a92 Revert "GitLab CI: Add an "Update Numbers" job."
This reverts commit f773bb4391. Maybe some
other time.
2021-10-10 20:32:28 +00:00
Gerald Combs f26ef902b2 GitLab CI: Initial macOS Intel build.
Add a "macOS Intel Package" job to .gitlab-ci.yml.
2021-10-09 09:32:32 -07:00
Gerald Combs f773bb4391 GitLab CI: Add an "Update Numbers" job.
Add an "Update Numbers" job that updates our various "numbers",
translations, and other files.
2021-10-08 15:34:26 -07:00
Gerald Combs aa41dd9a56 GitLab CI: Restrict our merges to master. 2021-10-06 03:45:55 +00:00
Gerald Combs 0aae44e145 GitLab CI: Switch to clang 13.
Clang 13 was added to the Ubuntu image in wireshark-containers
e5725506f4.
2021-10-06 00:28:01 +00:00
Gerald Combs 436dd46720 GitLab CI: Switch all Linux builds to our container registry.
Switch all of the remaining Linux builds to
registry.gitlab.com/wireshark/wireshark-containers/
2021-10-01 15:52:38 -07:00
Gerald Combs f9279ddaea GitLab CI: Switch the openSUSE 15.2 image.
Switch to the image in the wireshark/wireshark-containers registry.
2021-10-01 22:23:53 +00:00
Gerald Combs fee7f31e63 GitLab CI: Switch the CentOS 8 image.
Switch to the image in the wireshark/wireshark-containers registry.
2021-10-01 20:13:31 +00:00
Gerald Combs 7f47511653 Try to fix RPM packaging.
Asciidoctor is now required for packaging. Try to make sure it's
installed on CentOS 8 and openSUSE 15.2. Note that CentOS 8 doesn't have
an Asciidoctor package, which complicates our SPEC.
2021-10-01 18:26:24 +00:00
Gerald Combs f1ee29fc61 GitLab CI: Don't refresh our openSUSE repository.
The openSUSE 15.2 RPM Test step occasionally fails when trying to
retrieve repository metadata. Add "--no-remote" to the zypper install
command in the openSUSE 15.2 RPM Test to match the offline behavior of
our other RPM tests.
2021-09-27 04:17:01 +00:00
Alexis La Goutte 3e193b376f GitLab CI: Add HTML output for Clang Analyzer Check artifact 2021-09-22 04:44:28 +00:00
Alexis La Goutte 6c0897393b GitLab CI: remove ANSI color when generate Clang Check Analyzer text log 2021-09-22 04:44:28 +00:00
Alexis La Goutte 6cf6794e37 GitLab Ci: Fix duplicate apt cmd for daily run 2021-09-13 18:47:35 +00:00
Alexis La Goutte d940352da7 gitlab-ci: enhance cppcheck
display on CI build, the text output (and not xml)
store all cppcheck output files on cppcheck folder

(you need to launch cppcheck twice for generate txt and xml)
2021-09-06 04:04:46 +00:00
Alexis La Goutte 3403e37d47 gitlab-ci: Add artifact for check hf conflict 2021-09-05 07:49:29 +00:00
Alexis La Goutte 1f4e150ca7 gitlab-ci (Clang): Add Clang Analyzer ouput to artifacts 2021-09-02 16:06:17 +00:00
Gerald Combs 97b6610818 GitLab CI: Fix a command.
BSD stat doesn't support `--format`.
2021-08-27 15:47:40 -07:00
Gerald Combs 916dac3316 GitLab CI: Print package sizes and hashes.
Print the sizes of our source, Windows, and macOS packages. Print the
hash of our macOS package.
2021-08-27 22:01:25 +00:00
Gerald Combs 8c4543373a CMake: Use "'" instead of "’" in our guide filenames.
Use an apostrophe instead of RIGHT SINGLE QUOTATION MARK in our PDF and
EPUB filenames. Some programs (notably Okular) can't open filenames with
extended characters, at least on Windows.
2021-08-27 01:18:13 +00:00
Gerald Combs 5e016c1970 GitLab CI: Fix a path (try 2).
Copy the correct .dmg pattern to s3.
2021-08-25 22:18:00 +00:00
Gerald Combs f8fb504d74 GitLab CI: Publish our Windows PDBs. 2021-08-25 22:01:27 +00:00
Gerald Combs 3fbf6fa022 GitLab CI: Fix a path.
Copy the correct .dmg path to s3.
2021-08-25 21:42:48 +00:00
Gerald Combs 28c4c947c0 GitLab CI: Enable macOS Arm notarization.
Enable code signing & notarization in the macOS Arm Package job. Add
"needs: []". Verify the .dmg after notarizing it.
2021-08-25 20:40:29 +00:00
Alexis La Goutte 72eb858741 gitlab-ci: Fix daily API ref
mkdir / cd build is already on ubuntu step
2021-08-25 17:18:28 +00:00
Alexis La Goutte ebb1d7ffaf gitlab-ci: Fix daily Clang Analysis
mkdir / cd build is already on ubuntu step
2021-08-25 17:18:28 +00:00
Gerald Combs d2979e1976 GitLab CI: Initial macOS Arm build.
Add a "macOS Arm Package" job to .gitlab-ci.yml. Fixup a check in
osx-dmg.sh.
2021-08-24 21:22:41 +00:00
Gerald Combs a6e0482a6f Docs: Give the PDF and EPUB guides descriptive filenames.
Use the document title for our PDF and EPUB filenames under the theory
that "Wireshark User’s Guide.pdf" is more obvious than "user-guide.pdf".
2021-08-03 22:18:06 +00:00
Gerald Combs 282179b643 GitLab CI: Make sure Linux builds run under Docker.
Rename the .build job to .build-linux and require the "docker" tag. Add
a corresponding .test-linux job and have the Linux test stages extend
it. Update various steps accordingly.
2021-08-03 16:26:30 +00:00
Gerald Combs b58edf3cb8 Docs: Add epub targets for the guides.
Add user_guide_epub and developer_guide_epub targets that generate
EPUB versions of the User's Guide and Developer's Guide.
Ping #17494.
2021-07-30 21:05:37 +00:00
Gerald Combs 94d7b7846c GitLab CI: Add a retry to the Windows builds.
The Windows runners (Win32 in particular) sometimes time out during
tests. Add a retry.
2021-07-25 22:13:38 +00:00
Gerald Combs f6872b0c3e GitLab CI: Produce less test output.
Pass `--output-on-failure` instead of `--verbose` to ctest so that we
produce more relevant output.
2021-07-14 18:17:08 +00:00
Gerald Combs 9ae60d8483 GitLab CI: Don't print a performance summary on Windows.
In the Windows merge request build job, don't pass
/consoleloggerparameters:PerformanceSummary;NoSummary to msbuild. It
makes the output more verbose and in turn makes errors more difficult to
find.
2021-07-14 00:48:46 +00:00
Gerald Combs ef180c1be6 GitLab CI: Add a "merged" rule for dedicated runners.
We have to use dedicated runners for Windows builds, so create a
separate "if-merged" rule for them which includes only the
wireshark/wireshark repository.
2021-06-29 19:32:51 +00:00
Gerald Combs 798e45aaeb GitLab CI: Update to match recent PortableApps changes. 2021-06-19 16:51:55 -07:00
Gerald Combs 6495e7da99 Packaging: Add 64-bit PortableApps packages.
Build WiresharkPortable32 or WiresharkPortable64 as appropriate for our
target platform. Add WiresharkPortable64 steps to the Win64 builder.
Update the Developer's Guide. Fixes #17260.
2021-06-19 22:53:45 +00:00
Gerald Combs 2d9280089c GitLab CI: Add initial Windows package builds.
Start migrating the Windows package build steps from Buildbot.
2021-06-16 05:48:38 +00:00
Gerald Combs 35f5c116ca GitLab CI: Don't clobber the Code Lines before_script. 2021-06-07 11:40:19 -07:00
Gerald Combs e80e118f7a GitLab CI: Add more code line counters.
Count lines using cloc, scc, and tokei in addition to SLOCCount.
2021-06-07 18:20:10 +00:00
Gerald Combs a72b60b58b GitLab CI: Add CMake sections in more places.
Add section start and end markers for cmake in more places.
2021-05-28 18:39:28 +00:00
Gerald Combs 02f4dcb0ad GitLab CI: Enable ccache for fuzz builds.
Enable ccache for our fuzz builds. Add sections as described at
https://docs.gitlab.com/ee/ci/jobs/#expand-and-collapse-job-log-sections
for the CMake step as well.
2021-05-24 20:52:29 +00:00
Gerald Combs 9c6aef746a GitLab CI: Adjust the Documentation rules.
GitLab CI annoyingly shows "⚙ blocked" in the pipeline UI if you have
any jobs that can be run manually instead of a green checkmark even if
all of the other jobs in the pipeline have passed. It's not clear that
"blocked" means "you can run this manually if needed," so adjust the
Documentation rule so that this doesn't happen.
2021-05-07 21:51:24 +00:00
Gerald Combs 7c6df3848f GitLab CI: Give our jobs proper names.
GitLab's job YAML parser allows spaces in key names and our jobs are
visible in the web UI, so give them proper names.
2021-05-07 19:26:31 +00:00
Gerald Combs bedf0eb21c GitLab CI: Restore the ability to run pipelines from the web UI. 2021-05-07 11:49:51 -07:00
Gerald Combs ae37347103 GitLab CI: Simply our fuzz run times. 2021-05-07 09:21:30 -07:00
Gerald Combs 0c3db4c9fd GitLab CI: Install valgrind.
Install valgrind in the fuzz-valgrind job.
2021-05-06 14:49:31 -07:00
Gerald Combs 458bc93171 GitLab CI: Fix the fuzzing before and after scripts. 2021-05-06 09:24:35 -07:00
Gerald Combs 4397eed75c GitLab CI: Add Valgrind and randpkt fuzzing.
Move common fuzzing configuration items to .fuzz-ubuntu. Build using
Clang, which is what the Buildbot fuzzers did. Add jobs for fuzzing
using Valgrind and randpkt.
2021-05-05 18:54:34 -07:00
Gerald Combs da66bae61b GitLab CI: Fix a path. 2021-05-05 17:36:55 -07:00
Gerald Combs cc285882bf GitLab CI: Fill in fuzz-test.
Fuzz using our runner and our capture menagerie. Extend the run time.
Check for failures and report them.
2021-05-05 15:46:45 -07:00
Gerald Combs 3401f9697d Revert "GitLab CI: Try switching Windows builds back to Qt 5.15.1."
This reverts commit b258f90ce5, which was
an attempt to fix a CI build issue by changing our Qt version. That
didn't fix the issue. Switching from CMake 3.20 to 3.19.8 *did*, which
suggests that we've run into

https://gitlab.kitware.com/cmake/cmake/-/issues/21145
2021-05-05 17:16:16 +00:00
Gerald Combs d7bdd77a4c GitLab CI: Add a minimal fuzzing job.
Add a -t option to tools/fuzz-test.sh which lets you specify a maximum
fuzz time.

Add an initial "fuzz-test" job which fuzzes test/captures/* for 5
minutes. To do: Fuzz longer using our capture menagerie and report
failures.
2021-05-05 16:58:12 +00:00
Gerald Combs 4100cd748a GitLab CI: Fix our API reference uploads. 2021-05-04 14:10:46 -07:00
Gerald Combs 773c35d70a GitLab CI: Fix an upload command. 2021-05-04 13:11:23 -07:00
Gerald Combs 3b18c3f1fd GitLab CI: Distribute our documentation.
Rename the "docbook" job to "documentation". Make sure we can do syntax
highlighting and produce PDFs. Distribute the docs that we build. Allow
the job to be manually run if we don't update any documentation sources.
2021-05-04 18:52:10 +00:00
Gerald Combs 71f66bee3b GitLab CI: Consolidate repeated RPM declarations.
Move repeated build declarations to .build-rpm. Add .test-rpm and move
repeated test declarations there.
2021-05-03 20:32:10 +00:00
Gerald Combs d6500f5870 GitLab CI: Publish the API reference.
Build the wsar_html_zip instead of wsar_html and (re-)publish it at
https://www.wireshark.org/download/docs/. Move the doxygen_all job to
the daily schedule section.
2021-05-03 10:34:31 -07:00
Gerald Combs 74145a8bc6 GitLab CI: Fix our Coverity submission URLs. 2021-05-03 09:46:18 -07:00
Gerald Combs 6467a5ecad GitLab CI: Try to fix Coverity submissions.
Fixup some variable names.
2021-05-03 09:04:14 -07:00