forked from osmocom/wireshark
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:
parent
172323a3e1
commit
d23b0b82c4
|
@ -191,6 +191,7 @@ build:debian-stable:
|
||||||
extends: .build
|
extends: .build
|
||||||
image: wireshark/wireshark-debian-stable-dev
|
image: wireshark/wireshark-debian-stable-dev
|
||||||
script:
|
script:
|
||||||
|
- perl tools/make-version.pl --set-release
|
||||||
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
|
||||||
# https://gitlab.com/gitlab-com/support-forum/issues/2790
|
# https://gitlab.com/gitlab-com/support-forum/issues/2790
|
||||||
- export DH_QUIET=1
|
- export DH_QUIET=1
|
||||||
|
|
|
@ -516,12 +516,13 @@ sub update_debian_changelog
|
||||||
|
|
||||||
open(CHANGELOG, "< $filepath") || die "Can't read $filepath!";
|
open(CHANGELOG, "< $filepath") || die "Can't read $filepath!";
|
||||||
while ($line = <CHANGELOG>) {
|
while ($line = <CHANGELOG>) {
|
||||||
if ($set_version && CHANGELOG->input_line_number() == 1) {
|
if (CHANGELOG->input_line_number() == 1) {
|
||||||
$line =~ /^.*?([\r\n]+)$/;
|
$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_major,
|
||||||
$version_minor,
|
$version_minor,
|
||||||
$version_micro,
|
$version_micro,
|
||||||
|
$package_string,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$contents .= $line
|
$contents .= $line
|
||||||
|
@ -571,10 +572,10 @@ sub update_versioned_files
|
||||||
$version_minor, $version_micro,
|
$version_minor, $version_micro,
|
||||||
$package_string;
|
$package_string;
|
||||||
&update_cmakelists_txt;
|
&update_cmakelists_txt;
|
||||||
|
&update_debian_changelog;
|
||||||
if ($set_version) {
|
if ($set_version) {
|
||||||
&update_attributes_asciidoc;
|
&update_attributes_asciidoc;
|
||||||
&update_docinfo_asciidoc;
|
&update_docinfo_asciidoc;
|
||||||
&update_debian_changelog;
|
|
||||||
&update_cmake_lib_releases;
|
&update_cmake_lib_releases;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -723,7 +724,9 @@ sub get_config {
|
||||||
|
|
||||||
&get_config();
|
&get_config();
|
||||||
|
|
||||||
&read_repo_info();
|
if (! $set_version) {
|
||||||
|
&read_repo_info();
|
||||||
|
}
|
||||||
|
|
||||||
&print_VCS_REVISION;
|
&print_VCS_REVISION;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue