diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-25 16:22:35 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-05-31 08:35:17 -0400 |
| commit | 5c4421b1a2d45edfc31f2d37c8b4a47c619a424b (patch) | |
| tree | 345186479e2cc75c314cb02ee4cca3f49fa3e100 /.gitlab-ci.yml | |
| parent | 83467435c4ea81daa7b97ed5d914f543f9e885a3 (diff) | |
| download | haskell-5c4421b1a2d45edfc31f2d37c8b4a47c619a424b.tar.gz | |
hadrian: Introduce new package database for executables needed to build stage0
These executables (such as hsc2hs) are built using the boot compiler and
crucially, most libraries from the global package database.
We also move other build-time executables to be built in this stage such
as linters which also cleans up which libraries end up in the global
package database. This allows us to remove hacks where linters-common is
removed from the package database when a bindist is created.
This fixes issues caused by infinite recursion due to bytestring adding
a dependency on template-haskell.
Fixes #21634
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de11ada4be..aefa6ee42f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -224,12 +224,12 @@ typecheck-testsuite: BUILD_FLAVOUR: default script: - .gitlab/ci.sh configure - - .gitlab/ci.sh run_hadrian stage1:exe:lint-submodule-refs + - .gitlab/ci.sh run_hadrian stage0:exe:lint-submodule-refs - git fetch "$CI_MERGE_REQUEST_PROJECT_URL" $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - base="$(git merge-base FETCH_HEAD $CI_COMMIT_SHA)" - "echo Linting submodule changes between $base..$CI_COMMIT_SHA" - git submodule foreach git remote update - - _build/stage0/bin/lint-submodule-refs . $(git rev-list $base..$CI_COMMIT_SHA) + - _build/stageBoot/bin/lint-submodule-refs . $(git rev-list $base..$CI_COMMIT_SHA) dependencies: [] # We allow the submodule checker to fail when run on merge requests (to @@ -287,10 +287,10 @@ lint-submods-branch: BUILD_FLAVOUR: default script: - .gitlab/ci.sh configure - - .gitlab/ci.sh run_hadrian stage1:exe:lint-submodule-refs + - .gitlab/ci.sh run_hadrian stage0:exe:lint-submodule-refs - "echo Linting submodule changes between $CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA" - git submodule foreach git remote update - - _build/stage0/bin/lint-submodule-refs . $(git rev-list $CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA) + - _build/stageBoot/bin/lint-submodule-refs . $(git rev-list $CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA) rules: - if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH =~ /ghc-[0.9]+\.[0-9]+/' |