[Git][ghc/ghc][wip/romes/hardwire-ghc-unit-id] 2 commits: Fix upload_ghc_libs glob

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/romes/hardwire-ghc-unit-id at Glasgow Haskell Compiler / GHC


Commits:
660294de by GHC GitLab CI at 2023-04-06T12:34:16+01:00
Fix upload_ghc_libs glob

- - - - -
e26193da by GHC GitLab CI at 2023-04-18T15:41:01+01:00
Cores

- - - - -


2 changed files:

- .gitlab/ci.sh
- .gitlab/rel_eng/upload_ghc_libs.py


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -169,7 +169,7 @@ PATH="$toolchain/bin:$PATH"
 
 export METRICS_FILE="$TOP/performance-metrics.tsv"
 
-cores="$(mk/detect-cpu-count.sh)"
+cores=1 #"$(mk/detect-cpu-count.sh)"
 
 # Use a local temporary directory to ensure that concurrent builds don't
 # interfere with one another


=====================================
.gitlab/rel_eng/upload_ghc_libs.py
=====================================
@@ -25,6 +25,7 @@ import tempfile
 import re
 import pickle
 import os
+import glob
 
 
 WORK_DIR = Path('.upload-libs')
@@ -152,7 +153,10 @@ def prepare_docs(bindist: Path, pkg: Package):
     cabal_file = pkg.path / f'{pkg.name}.cabal'
     version = get_version(cabal_file)
     assert version is not None
-    docdir = bindist / 'doc' / 'html' / 'libraries' / (pkg.name + "-" + version)
+    docdir_prefix = bindist / 'doc' / 'html' / 'libraries' / (pkg.name + "-" + version)
+
+    docdir = glob.glob(str(docdir_prefix) + "*")[0]
+    print(docdir)
 
     # Build the documentation tarball from the bindist documentation
     stem = f'{pkg.name}-{version}-docs'



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a75037892c809b196d0538de306883e215c4ddfc...e26193da044df324ac77f9421a7fe974ba520226

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a75037892c809b196d0538de306883e215c4ddfc...e26193da044df324ac77f9421a7fe974ba520226
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/20230418/c5fd03be/attachment-0001.html>