From 650b7cee5700eae9ab6c300fbdb816dead6f01f5 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 4 Jan 2021 20:01:14 +0200 Subject: Revert "test: make sure Cargo.toml and debian/changelog versions match" This reverts commit 4a779c234c3dbf2685ad81be92a96688266fec58. CI munges the Debian version, making the version check always fail. Back to the drawing board for this. --- check | 9 --------- debian/changelog | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/check b/check index 73a02b7..65514cc 100755 --- a/check +++ b/check @@ -21,15 +21,6 @@ got_cargo_cmd() cargo --list | grep " $1 " > /dev/null } -# Check version numbers in Cargo.toml vs debian/changelog -v1="$(awk '/^version/ { print $NF }' Cargo.toml | tr -d '"')" -v2="$(dpkg-parsechangelog -SVersion | sed 's/-.*$//')" -if [ "$v1" != "$v2" ] -then - echo "Version from Carog.toml ($v1) and debian/changelog ($v2) don't match" 1>&2 - exit 1 -fi - cargo build --all-targets $quiet got_cargo_cmd clippy && cargo clippy $quiet got_cargo_cmd fmt && cargo fmt -- --check diff --git a/debian/changelog b/debian/changelog index 8b8d16a..3a8701c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -obnam (0.1.0-1) unstable; urgency=low +obnam (0.1-1) unstable; urgency=low * Initial packaging. This is not intended to be uploaded to Debian, so no closing of an ITP bug. -- cgit v1.2.1