[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: Fix :add docs in user guide

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
c54732e1 by Jan Hrček at 2022-09-06T13:26:10-04:00
Fix :add docs in user guide

- - - - -
1d59e3f8 by Cheng Shao at 2022-09-06T13:26:11-04:00
ci: remove unused build_make/test_make in ci script

- - - - -


2 changed files:

- .gitlab/ci.sh
- docs/users_guide/ghci.rst


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -50,11 +50,6 @@ Common Modes:
   shell         Run an interactive shell with a configured build environment.
   save_cache    Preserve the cabal cache
 
-Make build system:
-
-  build_make    Build GHC via the make build system
-  test_make     Test GHC via the make build system
-
 Hadrian build system
   build_hadrian Build GHC via the Hadrian build system
   test_hadrian  Test GHC via the Hadrian build system
@@ -436,23 +431,6 @@ function configure() {
   end_section "configuring"
 }
 
-function build_make() {
-  check_release_build
-  prepare_build_mk
-  if [[ -z "$BIN_DIST_PREP_TAR_COMP" ]]; then
-    fail "BIN_DIST_PREP_TAR_COMP is not set"
-  fi
-  if [[ -n "${VERBOSE:-}" ]]; then
-    MAKE_ARGS="${MAKE_ARGS:-} V=1"
-  else
-    MAKE_ARGS="${MAKE_ARGS:-} V=0"
-  fi
-
-  run "$MAKE" -j"$cores" "$MAKE_ARGS"
-  run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1
-  ls -lh "$BIN_DIST_PREP_TAR_COMP"
-}
-
 function fetch_perf_notes() {
   info "Fetching perf notes..."
   "$TOP/.gitlab/test-metrics.sh" pull
@@ -508,23 +486,6 @@ function check_release_build() {
   fi
 }
 
-function test_make() {
-  if [ -n "${CROSS_TARGET:-}" ]; then
-    info "Can't test cross-compiled build."
-    return
-  fi
-
-  check_msys2_deps inplace/bin/ghc-stage2 --version
-  check_release_build
-
-  run "$MAKE" test_bindist TEST_PREP=YES TEST_PROF=${RELEASE_JOB:-}
-  (unset $(compgen -v | grep CI_*);
-    run "$MAKE" V=0 VERBOSE=1 test \
-      THREADS="$cores" \
-      JUNIT_FILE=../../junit.xml \
-      EXTRA_RUNTEST_OPTS="${RUNTEST_ARGS:-}")
-}
-
 function build_hadrian() {
   if [ -z "${BIN_DIST_NAME:-}" ]; then
     fail "BIN_DIST_NAME not set"
@@ -842,13 +803,6 @@ case $1 in
   usage) usage ;;
   setup) setup && cleanup_submodules ;;
   configure) time_it "configure" configure ;;
-  build_make) time_it "build" build_make ;;
-  test_make)
-    fetch_perf_notes
-    res=0
-    time_it "test" test_make || res=$?
-    push_perf_notes
-    exit $res ;;
   build_hadrian) time_it "build" build_hadrian ;;
   # N.B. Always push notes, even if the build fails. This is okay to do as the
   # testsuite driver doesn't record notes for tests that fail due to


=====================================
docs/users_guide/ghci.rst
=====================================
@@ -2183,7 +2183,7 @@ commonly used commands.
     Abandons the current evaluation (only available when stopped at a
     breakpoint).
 
-.. ghci-cmd:: :add;[*] ⟨module⟩
+.. ghci-cmd:: :add; [*]⟨module⟩
 
     Add ⟨module⟩(s) to the current target set, and perform a reload.
     Normally pre-compiled code for the module will be loaded if



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/841eaf3608769f2a4caa48c4f7bc82d1ceb24ce6...1d59e3f88a5418146061c11f261ca373b459f206

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/841eaf3608769f2a4caa48c4f7bc82d1ceb24ce6...1d59e3f88a5418146061c11f261ca373b459f206
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/20220906/84876683/attachment-0001.html>