[Git][ghc/ghc][master] Fix project version for ProjectVersionMunged (fix #19058)

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
659fcb14 by Sylvain Henry at 2020-12-17T13:58:30-05:00
Fix project version for ProjectVersionMunged (fix #19058)

- - - - -


2 changed files:

- .gitlab/linters/check-version-number.sh
- configure.ac


Changes:

=====================================
.gitlab/linters/check-version-number.sh
=====================================
@@ -2,5 +2,6 @@
 
 set -e
 
-grep -E -q '\[[0-9]+\.[0-9]+\.[0-9]+\]' configure.ac ||
-  ( echo "error: configure.ac: GHC version number must have three components."; exit 1 )
+grep -E -q 'RELEASE=NO' configure.ac ||
+  grep -E -q '\[[0-9]+\.[0-9]+\.[0-9]+\]' configure.ac ||
+  ( echo "error: configure.ac: GHC version number must have three components when RELEASE=YES."; exit 1 )


=====================================
configure.ac
=====================================
@@ -13,7 +13,10 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.1.0], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.1], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+    # Version on HEAD must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
+    # to be useful (cf #19058)
+
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/659fcb14937e60510e3eea4c1211ea117419905b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/659fcb14937e60510e3eea4c1211ea117419905b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201217/91222ffd/attachment.html>