Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
-
772c0d0e
by Cheng Shao at 2026-02-13T00:16:22-05:00
-
12f48505
by Cheng Shao at 2026-02-13T00:16:23-05:00
3 changed files:
Changes:
| ... | ... | @@ -387,20 +387,6 @@ lint-submods-branch: |
| 387 | 387 | paths:
|
| 388 | 388 | - cabal-cache
|
| 389 | 389 | |
| 390 | -# Disabled due to #22830
|
|
| 391 | -.hlint-ghc-and-base:
|
|
| 392 | - extends: .lint-params
|
|
| 393 | - image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV"
|
|
| 394 | - variables:
|
|
| 395 | - BUILD_FLAVOUR: default
|
|
| 396 | - script:
|
|
| 397 | - - .gitlab/ci.sh setup
|
|
| 398 | - - .gitlab/ci.sh configure
|
|
| 399 | - - .gitlab/ci.sh run_hadrian lint:ghc-internal
|
|
| 400 | - - .gitlab/ci.sh run_hadrian lint:ghc-experimental
|
|
| 401 | - - .gitlab/ci.sh run_hadrian lint:base
|
|
| 402 | - - .gitlab/ci.sh run_hadrian lint:compiler
|
|
| 403 | - |
|
| 404 | 390 | ############################################################
|
| 405 | 391 | # GHC-in-GHCi (Hadrian)
|
| 406 | 392 | ############################################################
|
| ... | ... | @@ -1470,7 +1470,7 @@ async function nodeMain({ searchDirs, mainSoPath, outFd, inFd, args }) { |
| 1470 | 1470 | );
|
| 1471 | 1471 | }
|
| 1472 | 1472 | |
| 1473 | -const isNodeMain = isNode && import.meta.filename === process.argv[1];
|
|
| 1473 | +const isNodeMain = isNode && import.meta.main;
|
|
| 1474 | 1474 | |
| 1475 | 1475 | // node iserv as invoked by
|
| 1476 | 1476 | // GHC.Runtime.Interpreter.Wasm.spawnWasmInterp
|
| ... | ... | @@ -119,7 +119,7 @@ function isMain() { |
| 119 | 119 | return false;
|
| 120 | 120 | }
|
| 121 | 121 | |
| 122 | - return import.meta.filename === process.argv[1];
|
|
| 122 | + return import.meta.main;
|
|
| 123 | 123 | }
|
| 124 | 124 | |
| 125 | 125 | async function main() {
|