[Git][ghc/ghc][wip/ghc-9.10] 5 commits: configure: Bump GHC version to 9.11
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Mon Mar 11 20:35:33 UTC 2024
Ben Gamari pushed to branch wip/ghc-9.10 at Glasgow Haskell Compiler / GHC
Commits:
dc207d06 by Ben Gamari at 2024-03-10T08:56:08-04:00
configure: Bump GHC version to 9.11
Bumps haddock submodule.
- - - - -
eb933212 by Ben Gamari at 2024-03-10T09:32:03-04:00
gitlab-ci: Allow test-primops to fail
It's still a bit sensitive to warnings, unfortunately.
- - - - -
fc270d76 by Ben Gamari at 2024-03-10T09:32:03-04:00
rel_eng/upload: Purge both $rel_name/ and $ver/
This is necessary for prereleases, where GHCup accesses the release via
`$ver/`
- - - - -
570c32dd by Ben Gamari at 2024-03-11T16:33:44-04:00
hadrian: Package mingw toolchain in expected location
This fixes #24525, a regression due to 41cbaf44a6ab5eb9fa676d65d32df8377898dc89.
Specifically, GHC expects to find the mingw32 toolchain in the binary distribution
root. However, after this patch it was packaged in the `lib/` directory.
- - - - -
eee314ac by Ben Gamari at 2024-03-11T16:33:47-04:00
hadrian/bindist: Eliminate extraneous `dirname` invocation
Previously we would call `dirname` twice per installed library file.
We now instead reuse this result. This helps appreciably on Windows, where
processes are quite expensive.
- - - - -
6 changed files:
- .gitlab-ci.yml
- .gitlab/rel_eng/upload.sh
- configure.ac
- hadrian/bindist/Makefile
- hadrian/src/Rules/BinaryDist.hs
- utils/haddock
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -899,6 +899,7 @@ test-primops-nightly:
test-primops-release:
extends: .test-primops
+ allow_failure: true
rules:
- if: '$RELEASE_JOB == "yes"'
=====================================
.gitlab/rel_eng/upload.sh
=====================================
@@ -136,7 +136,7 @@ function upload() {
}
function purge_all() {
- dir="$(echo $rel_name | sed s/-release//)"
+ local dir="$(echo $rel_name | sed s/-release//)"
# Purge CDN cache
curl -X PURGE http://downloads.haskell.org/ghc/
curl -X PURGE http://downloads.haskell.org/~ghc/
@@ -150,12 +150,18 @@ function purge_all() {
}
function purge_file() {
- curl -X PURGE http://downloads.haskell.org/~ghc/$rel_name/$i
- curl -X PURGE http://downloads.haskell.org/~ghc/$rel_name/$i/
- curl -X PURGE http://downloads.haskell.org/~ghc/$rel_name/$i/docs/
- curl -X PURGE http://downloads.haskell.org/ghc/$rel_name/$i
- curl -X PURGE http://downloads.haskell.org/ghc/$rel_name/$i/
- curl -X PURGE http://downloads.haskell.org/ghc/$rel_name/$i/docs/
+ dirs=(
+ "~ghc/$rel_name"
+ "ghc/$rel_name"
+ "~ghc/$ver"
+ "ghc/$ver"
+ )
+
+ for dir in ${dirs[@]}; do
+ curl -X PURGE http://downloads.haskell.org/$dir/$i
+ curl -X PURGE http://downloads.haskell.org/$dir/$i/
+ curl -X PURGE http://downloads.haskell.org/$dir/$i/docs/
+ done
}
function prepare_docs() {
=====================================
configure.ac
=====================================
@@ -13,7 +13,7 @@ dnl
# see what flags are available. (Better yet, read the documentation!)
#
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.10.0], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.11], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
# Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
# to be useful (cf #19058). However, the version must have three components
# (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are
=====================================
hadrian/bindist/Makefile
=====================================
@@ -175,18 +175,19 @@ install_lib: lib/settings
@dest="$(DESTDIR)$(ActualLibsDir)"; \
cd lib; \
for i in `$(FIND) . -type f`; do \
- $(INSTALL_DIR) "$$dest/`dirname $$i`" ; \
+ dir="`dirname $$i`"
+ $(INSTALL_DIR) "$$dest/$$dir" ; \
case $$i in \
*.a) \
- $(INSTALL_DATA) $$i "$$dest/`dirname $$i`" ; \
+ $(INSTALL_DATA) $$i "$$dest/$$dir" ; \
$(RANLIB_CMD) "$$dest"/$$i ;; \
*.dll) \
- $(INSTALL_PROGRAM) $$i "$$dest/`dirname $$i`" ; \
+ $(INSTALL_PROGRAM) $$i "$$dest/$$dir" ; \
$(STRIP_CMD) "$$dest"/$$i ;; \
*.so) \
- $(INSTALL_SHLIB) $$i "$$dest/`dirname $$i`" ;; \
+ $(INSTALL_SHLIB) $$i "$$dest/$$dir" ;; \
*.dylib) \
- $(INSTALL_SHLIB) $$i "$$dest/`dirname $$i`" ;; \
+ $(INSTALL_SHLIB) $$i "$$dest/$$dir" ;; \
*.mjs) \
$(INSTALL_SCRIPT) $$i "$$dest/`dirname $$i`" ;; \
*) \
=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -135,7 +135,8 @@ bindistRules = do
let ghcVersionPretty = "ghc-" ++ version ++ "-" ++ targetPlatform
let prefix = cwd -/- root -/- "reloc-bindist" -/- ghcVersionPretty
installTo Relocatable prefix
-
+ copyDirectory (root -/- "mingw") prefix
+ liftIO $ IO.removeDirectoryRecursive (prefix -/- "lib" -/- "mingw")
phony "install" $ do
need ["binary-dist-dir"]
@@ -145,8 +146,6 @@ bindistRules = do
installTo NotRelocatable installPrefix
phony "binary-dist-dir" $ do
-
-
version <- setting ProjectVersion
targetPlatform <- setting TargetPlatformFull
distDir <- Context.distDir Stage1
@@ -309,7 +308,7 @@ bindistRules = do
let buildBinDist compressor = do
win_target <- isWinTarget
- when win_target (error "normal binary-dist does not work for windows target, use `reloc-binary-dist-*` target instead.")
+ when win_target (error "normal binary-dist does not work for Windows targets, use `reloc-binary-dist-*` target instead.")
buildBinDistX "binary-dist-dir" "bindist" compressor
buildBinDistReloc = buildBinDistX "reloc-binary-dist-dir" "reloc-bindist"
=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 243fefaa40ddcc7c657a95e92f30cb79ec4ecb45
+Subproject commit 504d4c1842db93704b4c5e158ecc3af7050ba9fe
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/19bca2fec8650034b1f9d9c3407713e69d653c73...eee314ac17396357c9e0520a3b389f47cd90e80b
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/19bca2fec8650034b1f9d9c3407713e69d653c73...eee314ac17396357c9e0520a3b389f47cd90e80b
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/20240311/1d6ec641/attachment-0001.html>
More information about the ghc-commits
mailing list