Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 700a1dd1 by Simon Jakobi at 2026-07-23T11:21:20-04:00 ci: Reduce lint job setup costs Avoid fetching unnecessary history and submodules for lightweight lint jobs. Run changelog validation without Hadrian. Because the lint-author job is now based on the .lint template directly, we enhance it to allow Git to read from the runner-owned checkouts, In the previously used .lint-params template, this permissions issue was addressed via `chown`. Closes #27521. Assisted-by: gpt-5.6-sol via Codex CLI - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - hadrian/src/Rules/Test.hs Changes: ===================================== .gitlab-ci.yml ===================================== @@ -134,6 +134,10 @@ workflow: stage: tool-lint tags: - lint + before_script: + # Allow Git to read from the runner-owned checkout. This is needed + # for example by the lint-author job. + - git config --global --add safe.directory "$CI_PROJECT_DIR" rules: - *drafts-can-fail-lint - when: always @@ -251,29 +255,16 @@ ghc-linters: lint-changelog: stage: tool-lint image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb13:$DOCKER_REV" - extends: .lint-params + extends: .lint variables: - BUILD_FLAVOUR: default CHANGELOG_EXPECT_MR: "$CI_MERGE_REQUEST_IID" + GIT_DEPTH: 1 + GIT_SUBMODULE_STRATEGY: none + before_script: + - export PATH="/opt/toolchain/bin:$PATH" + - git config --global --add safe.directory "$CI_PROJECT_DIR" script: - # Cancel the job if there is a no-changelog label - - | - [[ ",${CI_MERGE_REQUEST_LABELS}," == *",no-changelog,"* ]] && exit 0 - # Check that the MR adds at least one changelog entry - - git fetch "$CI_MERGE_REQUEST_PROJECT_URL" "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" - - base="$(git merge-base FETCH_HEAD $CI_COMMIT_SHA)" - - added=$(git diff --name-only --diff-filter=A "$base..$CI_COMMIT_SHA" -- 'changelog.d/' | grep -v '^changelog.d/config$' || true) - - | - if [ -z "$added" ]; then - echo "ERROR: No changelog entry found in changelog.d/" - echo "Please add a changelog entry file describing your user-facing changes." - echo "If this MR does not need a changelog entry, apply the 'no-changelog' label." - exit 1 - fi - - echo "Found changelog entries:" $added - # Build changelog-d and validate all entries (checks required fields, section names, MR number) - - .gitlab/ci.sh configure - - .gitlab/ci.sh run_hadrian test --test-root-dirs="testsuite/tests/linters" --only=changelog-d + - .gitlab/ci.sh lint_changelog dependencies: [] rules: - if: '$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/' @@ -285,6 +276,9 @@ lint-changelog: lint-linters: image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV" extends: .lint + variables: + GIT_DEPTH: 1 + GIT_SUBMODULE_STRATEGY: none script: - mypy testsuite/tests/linters/regex-linters/*.py dependencies: [] @@ -293,6 +287,9 @@ lint-linters: lint-testsuite: image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb13:$DOCKER_REV" extends: .lint + variables: + GIT_DEPTH: 1 + GIT_SUBMODULE_STRATEGY: none script: - make -Ctestsuite list_broken TEST_HC=$GHC dependencies: [] @@ -301,6 +298,9 @@ lint-testsuite: typecheck-testsuite: image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV" extends: .lint + variables: + GIT_DEPTH: 1 + GIT_SUBMODULE_STRATEGY: none script: - mypy testsuite/driver/runtests.py dependencies: [] @@ -323,14 +323,13 @@ typecheck-testsuite: - _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 -# accommodate, e.g., haddock changes not yet upstream) but not on `master` or -# Marge jobs. +# Check that commits in an MR were not authored with the identity that CI uses +# when it needs to create commits itself. This only needs Git history. lint-author: image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb13:$DOCKER_REV" - extends: .lint-params + extends: .lint variables: - BUILD_FLAVOUR: default + GIT_SUBMODULE_STRATEGY: none script: - git fetch "$CI_MERGE_REQUEST_PROJECT_URL" $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - base="$(git merge-base FETCH_HEAD $CI_COMMIT_SHA)" ===================================== .gitlab/ci.sh ===================================== @@ -57,6 +57,7 @@ Common Modes: save_cache Preserve the cabal cache build_hadrian Build GHC via the Hadrian build system test_hadrian Test GHC via the Hadrian build system + lint_changelog Check that an MR adds a valid changelog entry Environment variables affecting the build: @@ -971,6 +972,49 @@ function lint_author(){ done } +function lint_changelog() { + # Cancel the job if there is a no-changelog label. + if [[ ",${CI_MERGE_REQUEST_LABELS:-}," == *",no-changelog,"* ]]; then + exit 0 + fi + + # Check that the MR adds at least one changelog entry. + git fetch --depth=1 \ + "$CI_MERGE_REQUEST_PROJECT_URL" \ + "$CI_MERGE_REQUEST_DIFF_BASE_SHA" + + local added + added=$(git diff --name-only --diff-filter=A \ + "$CI_MERGE_REQUEST_DIFF_BASE_SHA..$CI_COMMIT_SHA" -- \ + 'changelog.d/' | grep -v '^changelog.d/config$' || true) + + if [ -z "$added" ]; then + error "No changelog entry found in changelog.d/" + echo "Please add a changelog entry file describing your user-facing changes." + echo "If this MR does not need a changelog entry, apply the 'no-changelog' label." + exit 1 + fi + echo "Found changelog entries: $added" + + # Build changelog-d with the bootstrap compiler and validate all entries + # (checks required fields, section names, and the MR number). + local changelog_build_dir + changelog_build_dir="$(mktemp -d)" + "$GHC" -Werror \ + -package base \ + -package bytestring \ + -package Cabal-syntax \ + -package containers \ + -package directory \ + -package filepath \ + -package pretty \ + -outputdir "$changelog_build_dir" \ + -o "$changelog_build_dir/changelog-d" \ + utils/changelog-d/ChangelogD.hs + "$changelog_build_dir/changelog-d" \ + changelog.d/ --validate --expect-mr "$CHANGELOG_EXPECT_MR" +} + function abi_of(){ DIR=$(realpath $1) mkdir -p "$OUT" @@ -1085,6 +1129,7 @@ case ${1:-help} in perf_test) run_perf_test ;; abi_test) abi_test ;; cabal_test) cabal_test ;; + lint_changelog) lint_changelog ;; lint_author) shift; lint_author "$@" ;; compare_interfaces_of) shift; compare_interfaces_of "$@" ;; clean) clean ;; ===================================== hadrian/src/Rules/Test.hs ===================================== @@ -89,6 +89,8 @@ checkPrograms = , CheckProgram "lint:notes" noteLinterProgPath noteLinterSourcePath noteLinterExtra lintNotes (const stage0Boot) id , CheckProgram "lint:codes" codeLinterProgPath codeLinterSourcePath codeLinterExtra lintCodes id id , CheckProgram "lint:whitespace" whitespaceLinterProgPath whitespaceLinterSourcePath whitespaceLinterExtra lintWhitespace (const stage0Boot) (filter (/= lintersCommon)) + -- N.B. The lint:changelog build is replicated by lint_changelog in + -- .gitlab/ci.sh. Keep its package dependencies in sync with this target. , CheckProgram "lint:changelog" changelogDProgPath changelogDSourcePath changelogDExtra changelogD (const stage0Boot) id ] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/700a1dd15345ebf4f028a826db719f13... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/700a1dd15345ebf4f028a826db719f13... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help