[Git][ghc/ghc][ghc-9.0] 3 commits: Bump Win32 submodule

[Ben Gamari]

Ben Gamari pushed to branch ghc-9.0 at Glasgow Haskell Compiler / GHC


Commits:
fbdc93e7 by Ben Gamari at 2020-09-21T15:27:17-04:00
Bump Win32 submodule

- - - - -
17740c20 by Ben Gamari at 2020-09-21T15:27:17-04:00
ci.sh: Enforce minimum happy/alex versions

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

(cherry picked from commit a89c2fbab9bcf7d769e9d27262ab29f93342f114)

Modified to use happy-1.19

- - - - -
d4d44edb by Ben Gamari at 2020-09-22T17:05:52-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).

(cherry picked from commit 2f7ef2fb3234cdfb89b3da1298fc9c1b7381e418)

- - - - -


2 changed files:

- .gitlab/ci.sh
- libraries/Win32


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -8,6 +8,8 @@ set -e -o pipefail
 # Configuration:
 hackage_index_state="@1579718451"
 
+MIN_ALEX_VERSION="3.2"
+
 # Colors
 BLACK="0;30"
 GRAY="1;30"
@@ -168,6 +170,7 @@ function set_toolchain_paths() {
       HAPPY="$HOME/.cabal/bin/happy"
       ALEX="$HOME/.cabal/bin/alex"
   fi
+
   export GHC
   export CABAL
   export HAPPY
@@ -279,24 +282,25 @@ function fetch_cabal() {
 function setup_toolchain() {
   fetch_ghc
   fetch_cabal
-  cabal_install="$CABAL v2-install --index-state=$hackage_index_state --installdir=$toolchain/bin"
+
+  cabal_install="$CABAL v2-install \
+    --index-state=$hackage_index_state \
+    --installdir=$toolchain/bin \
+    --overwrite-policy=always"
+
   # Avoid symlinks on Windows
   case "$(uname)" in
     MSYS_*|MINGW*) cabal_install="$cabal_install --install-method=copy" ;;
     *) ;;
   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==1.19.*"
+
+  info "Building alex..."
+  $cabal_install alex --constraint="alex>=$MIN_ALEX_VERSION"
 }
 
 function cleanup_submodules() {


=====================================
libraries/Win32
=====================================
@@ -1 +1 @@
-Subproject commit ca5fbc12851b98a52f96a43ea19c54c9ecf0f9e3
+Subproject commit d68374423fa3d3edd6b776e412e4093cc69b5f64



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f91ea170d86fab45a9f4658b8b02f4adede9aef7...d4d44edbe4f9acbd523b3cc049f9a6ac3f7f0ddd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f91ea170d86fab45a9f4658b8b02f4adede9aef7...d4d44edbe4f9acbd523b3cc049f9a6ac3f7f0ddd
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/20200923/0d079f50/attachment-0001.html>