osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GitLab CI: Fix our debian-stable version. 

Run tools/make-version.pl in the build:debian-stable job.

Make sure make-version.pl updates debian/control correctly.
This commit is contained in:
Gerald Combs 2021-03-12 09:55:04 -08:00 committed by Wireshark GitLab Utility
parent 172323a3e1
commit d23b0b82c4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -191,6 +191,7 @@ build:debian-stable:
extends: .build
image: wireshark/wireshark-debian-stable-dev
script:
- perl tools/make-version.pl --set-release
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
# https://gitlab.com/gitlab-com/support-forum/issues/2790
- export DH_QUIET=1

11
tools/make-version.pl
View File

@ -516,12 +516,13 @@ sub update_debian_changelog
open(CHANGELOG, "< $filepath") || die "Can't read $filepath!";
while ($line = <CHANGELOG>) {
if ($set_version && CHANGELOG->input_line_number() == 1) {
if (CHANGELOG->input_line_number() == 1) {
$line =~ /^.*?([\r\n]+)$/;
$line = sprintf("wireshark (%d.%d.%d) unstable; urgency=low$1",
$line = sprintf("wireshark (%d.%d.%d%s) unstable; urgency=low$1",
$version_major,
$version_minor,
$version_micro,
$package_string,
);
}
$contents .= $line
@ -571,10 +572,10 @@ sub update_versioned_files
$version_minor, $version_micro,
$package_string;
&update_cmakelists_txt;
&update_debian_changelog;
if ($set_version) {
&update_attributes_asciidoc;
&update_docinfo_asciidoc;
&update_debian_changelog;
&update_cmake_lib_releases;
}
}
@ -723,7 +724,9 @@ sub get_config {
&get_config();
&read_repo_info();
if (! $set_version) {
&read_repo_info();
}
&print_VCS_REVISION;