[Git][ghc/ghc][master] 3 commits: Require happy >=1.20

[Marge Bot]

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


Commits:
2229d570 by Vladislav Zavialov at 2020-09-19T15:47:24-04:00
Require happy >=1.20

- - - - -
a89c2fba by Ben Gamari at 2020-09-19T15:47:24-04:00
ci.sh: Enforce minimum happy/alex versions

Also, always invoke cabal-install to ensure that happy/alex symlinks are
up-to-date.

- - - - -
2f7ef2fb by Ben Gamari at 2020-09-19T15:47:24-04:00
gitlab-ci: Ensure that cabal-install overwrites existing executables

Previously cabal-install wouldn't overwrite toolchain executables if
they already existed (as they likely would due to caching).

- - - - -


4 changed files:

- .gitlab/ci.sh
- aclocal.m4
- hadrian/cabal.project
- hadrian/hadrian.cabal


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -6,7 +6,9 @@
 set -e -o pipefail
 
 # Configuration:
-hackage_index_state="@1579718451"
+hackage_index_state="2020-09-14T19:30:43Z"
+MIN_HAPPY_VERSION="1.20"
+MIN_ALEX_VERSION="3.2"
 
 # Colors
 BLACK="0;30"
@@ -286,7 +288,9 @@ function setup_toolchain() {
 
   cabal_install="$CABAL v2-install \
     --with-compiler=$GHC \
-    --index-state=$hackage_index_state --installdir=$toolchain/bin"
+    --index-state=$hackage_index_state \
+    --installdir=$toolchain/bin \
+    --overwrite-policy=always"
 
   # Avoid symlinks on Windows
   case "$(uname)" in
@@ -294,17 +298,13 @@ function setup_toolchain() {
     *) ;;
   esac
 
-  if [ ! -e "$HAPPY" ]; then
-      info "Building happy..."
-      cabal update
-      $cabal_install happy
-  fi
+  cabal update
 
-  if [ ! -e "$ALEX" ]; then
-      info "Building alex..."
-      cabal update
-      $cabal_install alex
-  fi
+  info "Building happy..."
+  $cabal_install happy --constraint="happy>=$MIN_HAPPY_VERSION"
+
+  info "Building alex..."
+  $cabal_install alex --constraint="alex>=$MIN_ALEX_VERSION"
 }
 
 function cleanup_submodules() {


=====================================
aclocal.m4
=====================================
@@ -1063,8 +1063,8 @@ changequote([, ])dnl
 ])
 if test ! -f compiler/GHC/Parser.hs || test ! -f compiler/GHC/Cmm/Parser.hs
 then
-    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.19.10],
-      [AC_MSG_ERROR([Happy version 1.19.10 or later is required to compile GHC.])])[]
+    FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0],
+      [AC_MSG_ERROR([Happy version 1.20 or later is required to compile GHC.])])[]
     FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0],
       [AC_MSG_ERROR([Happy version 1.20 or earlier is required to compile GHC.])])[]
 fi


=====================================
hadrian/cabal.project
=====================================
@@ -1,7 +1,7 @@
 packages: ./
 
 -- This essentially freezes the build plan for hadrian
-index-state: 2020-06-16T03:59:14Z
+index-state: 2020-09-14T19:30:43Z
 
 -- N.B. Compile with -O0 since this is not a performance-critical executable
 -- and the Cabal takes nearly twice as long to build with -O1. See #16817.


=====================================
hadrian/hadrian.cabal
=====================================
@@ -148,7 +148,7 @@ executable hadrian
                        , transformers         >= 0.4     && < 0.6
                        , unordered-containers >= 0.2.1   && < 0.3
     build-tools:         alex  >= 3.1
-                       , happy >= 1.19.10 && < 1.21
+                       , happy >= 1.20.0 && < 1.21
     ghc-options:       -Wall
                        -Wincomplete-record-updates
                        -Wredundant-constraints



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/45fa82182bc61e3966fd51496c35130cd067a5df...2f7ef2fb3234cdfb89b3da1298fc9c1b7381e418

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/45fa82182bc61e3966fd51496c35130cd067a5df...2f7ef2fb3234cdfb89b3da1298fc9c1b7381e418
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/20200919/e69ae0e8/attachment-0001.html>