From 0d7c41cdc40b994aec616a84d78cf0375d63ad2e Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 29 Feb 2020 08:46:34 +0100
Subject: Adjust version check in ci-run.sh
---
dist/ci-run.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dist/ci-run.sh b/dist/ci-run.sh
index 5750a2b76..3edf1e32b 100755
--- a/dist/ci-run.sh
+++ b/dist/ci-run.sh
@@ -125,13 +125,14 @@ notag() {
vertag() {
if expr "$1" : 'v[0-9].*' > /dev/null; then
- # Remove leading 'v' in tags in the filenames.
- echo $1 | cut -c2-
# Check version defined in configure.
- if [ "x$1" != "x`grep "^ghdl_version=" configure | sed -e 's/.*"\(.*\)";/\1/'`" ]; then
- printf "${ANSI_RED}Tag '$1' does not match 'ghdl_version'!${ANSI_NOCOLOR}\n" 1>&2;
+ cfgver=`grep "^ghdl_version=" configure | sed -e 's/.*"\(.*\)"/\1/'`
+ if [ "x$1" != "xv$cfgver" ]; then
+ printf "${ANSI_RED}Tag '$1' does not match configure 'ghdl_version' ($cfgver)!${ANSI_NOCOLOR}\n" 1>&2;
exit 1
fi
+ # Remove leading 'v' in tags in the filenames.
+ echo $1 | cut -c2-
else
# Regular tag (like snapshots), nothing to change.
echo "$2"
--
cgit v1.2.3