[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Various Hadrian bootstrapping fixes
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Tue Aug 30 03:45:17 UTC 2022
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
ce387870 by sheaf at 2022-08-29T23:45:09-04:00
Various Hadrian bootstrapping fixes
- Don't always produce a distribution archive (#21629)
- Use correct executable names for ghc-pkg and hsc2hs on windows
(we were missing the .exe file extension)
- Fix a bug where we weren't using the right archive format on Windows
when unpacking the bootstrap sources.
Fixes #21629
- - - - -
cbb66e39 by Matthew Pickering at 2022-08-29T23:45:11-04:00
ci: Attempt using normal submodule cloning strategy
We do not use any recursively cloned submodules, and this protects us
from flaky upstream remotes.
Fixes #22121
- - - - -
3 changed files:
- .gitlab-ci.yml
- .gitlab/ci.sh
- hadrian/bootstrap/bootstrap.py
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -17,7 +17,7 @@ variables:
# Overridden by individual jobs
CONFIGURE_ARGS: ""
- GIT_SUBMODULE_STRATEGY: "recursive"
+ GIT_SUBMODULE_STRATEGY: "normal"
# Makes ci.sh isolate CABAL_DIR
HERMETIC: "YES"
=====================================
.gitlab/ci.sh
=====================================
@@ -377,8 +377,8 @@ function cleanup_submodules() {
# On Windows submodules can inexplicably get into funky states where git
# believes that the submodule is initialized yet its associated repository
# is not valid. Avoid failing in this case with the following insanity.
- git submodule sync --recursive || git submodule deinit --force --all
- git submodule update --init --recursive
+ git submodule sync || git submodule deinit --force --all
+ git submodule update --init
git submodule foreach git clean -xdf
else
info "Not cleaning submodules, not in a git repo"
=====================================
hadrian/bootstrap/bootstrap.py
=====================================
@@ -86,14 +86,17 @@ class Compiler:
self.ghc_path = ghc_path.resolve()
+ exe = ''
+ if platform.system() == 'Windows': exe = '.exe'
+
info = self._get_ghc_info()
self.version = info['Project version']
#self.lib_dir = Path(info['LibDir'])
#self.ghc_pkg_path = (self.lib_dir / 'bin' / 'ghc-pkg').resolve()
- self.ghc_pkg_path = (self.ghc_path.parent / 'ghc-pkg').resolve()
+ self.ghc_pkg_path = (self.ghc_path.parent / ('ghc-pkg' + exe)).resolve()
if not self.ghc_pkg_path.is_file():
raise TypeError(f'ghc-pkg {self.ghc_pkg_path} is not a file')
- self.hsc2hs_path = (self.ghc_path.parent / 'hsc2hs').resolve()
+ self.hsc2hs_path = (self.ghc_path.parent / ('hsc2hs' + exe)).resolve()
if not self.hsc2hs_path.is_file():
raise TypeError(f'hsc2hs {self.hsc2hs_path} is not a file')
@@ -367,6 +370,11 @@ def main() -> None:
help='path to GHC')
parser.add_argument('-s', '--bootstrap-sources', type=Path,
help='Path to prefetched bootstrap sources tarball')
+ parser.add_argument('--archive', dest='want_archive', action='store_true',
+ help='produce a Hadrian distribution archive (default)')
+ parser.add_argument('--no-archive', dest='want_archive', action='store_false',
+ help='do not produce a Hadrian distribution archive')
+ parser.set_defaults(want_archive=True)
subparsers = parser.add_subparsers(dest="command")
@@ -381,6 +389,9 @@ def main() -> None:
ghc = None
+ sources_fmt = 'gztar' # The archive format for the bootstrap sources archive.
+ if platform.system() == 'Windows': sources_fmt = 'zip'
+
if args.deps is None:
if args.bootstrap_sources is None:
# find appropriate plan in the same directory as the script
@@ -390,7 +401,7 @@ def main() -> None:
# We have a tarball with all the required information, unpack it and use for further
elif args.bootstrap_sources is not None and args.command != 'list-sources':
print(f'Unpacking {args.bootstrap_sources} to {TARBALLS}')
- shutil.unpack_archive(args.bootstrap_sources.resolve(), TARBALLS, 'gztar')
+ shutil.unpack_archive(args.bootstrap_sources.resolve(), TARBALLS, sources_fmt)
args.deps = TARBALLS / 'plan-bootstrap.json'
print(f"using plan-bootstrap.json ({args.deps}) from {args.bootstrap_sources}")
else:
@@ -428,10 +439,7 @@ def main() -> None:
shutil.copyfile(args.deps, rootdir / 'plan-bootstrap.json')
- fmt = 'gztar'
- if platform.system() == 'Windows': fmt = 'zip'
-
- archivename = shutil.make_archive(args.output, fmt, root_dir=rootdir)
+ archivename = shutil.make_archive(args.output, sources_fmt, root_dir=rootdir)
print(f"""
Bootstrap sources saved to {archivename}
@@ -475,21 +483,21 @@ Alternatively, you could use `bootstrap.py -w {ghc.ghc_path} -d {args.deps} fetc
bootstrap(info, ghc)
hadrian_path = (BINDIR / 'hadrian').resolve()
- archive = make_archive(hadrian_path)
-
print(dedent(f'''
Bootstrapping finished!
The resulting hadrian executable can be found at
{hadrian_path}
+ '''))
- It has been archived for distribution in
-
- {archive}
+ if args.want_archive:
+ dist_archive = make_archive(hadrian_path)
+ print(dedent(f'''
+ The Hadrian executable has been archived for distribution in
- You can use this executable to build GHC.
- '''))
+ {dist_archive}
+ '''))
else:
print(f"No such command: {args.command}")
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f8eaae746d645a2cbd4a9df9563187dc4b3bb853...cbb66e39ed10b4a5a54be51ee67a6a8abf036ccb
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f8eaae746d645a2cbd4a9df9563187dc4b3bb853...cbb66e39ed10b4a5a54be51ee67a6a8abf036ccb
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/20220829/24248df4/attachment-0001.html>
More information about the ghc-commits
mailing list