diff options
-rwxr-xr-x | .gitlab/gen_ci.hs | 5 | ||||
-rw-r--r-- | .gitlab/jobs.yaml | 29 | ||||
-rwxr-xr-x | .gitlab/rel_eng/upload_ghc_libs.py | 6 |
3 files changed, 29 insertions, 11 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 5badde02d5..66a829d978 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -760,7 +760,7 @@ nightly arch opsys bc = release :: Arch -> Opsys -> BuildConfig -> NamedJob Job release arch opsys bc = let NamedJob n j = job arch opsys (bc { buildFlavour = Release }) - in NamedJob { name = "release-" ++ n, jobInfo = addJobRule ReleaseOnly . keepArtifacts "1 year" . ignorePerfFailures . highCompression $ j} + in NamedJob { name = "release-" ++ n, jobInfo = addJobRule ReleaseOnly . keepArtifacts "1 year" . ignorePerfFailures . useHashUnitIds . highCompression $ j} -- Specific job modification functions @@ -785,6 +785,9 @@ ignorePerfFailures = addVariable "IGNORE_PERF_FAILURES" "all" highCompression :: Job -> Job highCompression = addVariable "XZ_OPT" "-9" +useHashUnitIds :: Job -> Job +useHashUnitIds = addVariable "HADRIAN_ARGS" "--hash-unit-ids" + -- | Mark the validate job to run in fast-ci mode fastCI :: JobGroup Job -> JobGroup Job fastCI = modifyValidateJobs (addJobRule FastCI) diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index 26ab071d71..46cb91bd73 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -2222,7 +2222,7 @@ "BIN_DIST_NAME": "ghc-aarch64-darwin-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "LANG": "en_US.UTF-8", "MACOSX_DEPLOYMENT_TARGET": "11.0", @@ -2286,6 +2286,7 @@ "BIN_DIST_NAME": "ghc-aarch64-linux-deb10-release+no_split_sections", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "aarch64-linux-deb10-release+no_split_sections", "XZ_OPT": "-9" @@ -2346,6 +2347,7 @@ "BIN_DIST_NAME": "ghc-i386-linux-deb9-release+no_split_sections", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "i386-linux-deb9-release+no_split_sections", "XZ_OPT": "-9" @@ -2406,7 +2408,7 @@ "BIN_DIST_NAME": "ghc-x86_64-darwin-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "LANG": "en_US.UTF-8", "MACOSX_DEPLOYMENT_TARGET": "10.10", @@ -2473,7 +2475,7 @@ "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", "BUILD_FLAVOUR": "release+fully_static", "CONFIGURE_ARGS": "--disable-ld-override ", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", "TEST_ENV": "x86_64-linux-alpine3_12-int_native-release+fully_static", @@ -2536,7 +2538,7 @@ "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", "BUILD_FLAVOUR": "release+fully_static+no_split_sections", "CONFIGURE_ARGS": "--disable-ld-override ", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", "TEST_ENV": "x86_64-linux-alpine3_12-release+fully_static+no_split_sections", @@ -2598,7 +2600,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-centos7-release+no_split_sections", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-centos7-release+no_split_sections", "XZ_OPT": "-9" @@ -2659,6 +2661,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-deb10-release", "XZ_OPT": "-9" @@ -2719,6 +2722,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-deb10-release+debug_info", "BUILD_FLAVOUR": "release+debug_info", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-deb10-release+debug_info", "XZ_OPT": "-9" @@ -2779,6 +2783,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-deb11-release", "XZ_OPT": "-9" @@ -2839,6 +2844,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-release+boot_nonmoving_gc", "BUILD_FLAVOUR": "release+boot_nonmoving_gc", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity", "TEST_ENV": "x86_64-linux-deb11-release+boot_nonmoving_gc", @@ -2900,6 +2906,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-deb9-release+no_split_sections", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-deb9-release+no_split_sections", "XZ_OPT": "-9" @@ -2960,6 +2967,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "LLC": "/bin/false", "OPT": "/bin/false", @@ -3022,6 +3030,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release+debug_info", "BUILD_FLAVOUR": "release+debug_info", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "LLC": "/bin/false", "OPT": "/bin/false", @@ -3084,7 +3093,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-fedora33-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", - "HADRIAN_ARGS": "--haddock-base-url", + "HADRIAN_ARGS": "--haddock-base-url --hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "LLC": "/bin/false", "OPT": "/bin/false", @@ -3147,7 +3156,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-rocky8-release", "XZ_OPT": "-9" @@ -3208,6 +3217,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu18_04-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-ubuntu18_04-release", "XZ_OPT": "-9" @@ -3268,6 +3278,7 @@ "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu20_04-release", "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "", + "HADRIAN_ARGS": "--hash-unit-ids", "IGNORE_PERF_FAILURES": "all", "TEST_ENV": "x86_64-linux-ubuntu20_04-release", "XZ_OPT": "-9" @@ -3325,7 +3336,7 @@ "CABAL_INSTALL_VERSION": "3.8.1.0", "CONFIGURE_ARGS": "", "GHC_VERSION": "9.4.3", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "LANG": "en_US.UTF-8", "MSYSTEM": "CLANG64", @@ -3385,7 +3396,7 @@ "CABAL_INSTALL_VERSION": "3.8.1.0", "CONFIGURE_ARGS": "", "GHC_VERSION": "9.4.3", - "HADRIAN_ARGS": "--docs=no-sphinx", + "HADRIAN_ARGS": "--hash-unit-ids --docs=no-sphinx", "IGNORE_PERF_FAILURES": "all", "LANG": "en_US.UTF-8", "MSYSTEM": "CLANG64", diff --git a/.gitlab/rel_eng/upload_ghc_libs.py b/.gitlab/rel_eng/upload_ghc_libs.py index ecbfa11bd4..22af341a5c 100755 --- a/.gitlab/rel_eng/upload_ghc_libs.py +++ b/.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' |