diff --git a/.changeset/selfish-worms-remain.md b/.changeset/selfish-worms-remain.md new file mode 100644 index 0000000000..1a5b06bd7f --- /dev/null +++ b/.changeset/selfish-worms-remain.md @@ -0,0 +1,5 @@ +--- +"hardhat": patch +--- + +Moved the calls to shouldMergeCompilationJobs from the task actions to the build system and made its' result the default fallback to use in absence of the mergeCompilationJobs option. diff --git a/v-next/hardhat/src/internal/builtin-plugins/solidity-test/task-action.ts b/v-next/hardhat/src/internal/builtin-plugins/solidity-test/task-action.ts index c19c9aaaf9..703eaad72a 100644 --- a/v-next/hardhat/src/internal/builtin-plugins/solidity-test/task-action.ts +++ b/v-next/hardhat/src/internal/builtin-plugins/solidity-test/task-action.ts @@ -14,7 +14,6 @@ import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path"; import { createNonClosingWriter } from "@nomicfoundation/hardhat-utils/stream"; import chalk from "chalk"; -import { shouldMergeCompilationJobs } from "../solidity/build-profiles.js"; import { getArtifacts, getBuildInfos, @@ -75,9 +74,6 @@ const runSolidityTests: NewTaskActionFunction = async ( const buildOptions: BuildOptions = { force: false, buildProfile: hre.globalOptions.buildProfile, - mergeCompilationJobs: shouldMergeCompilationJobs( - hre.globalOptions.buildProfile, - ), quiet: true, }; diff --git a/v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/build-system.ts b/v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/build-system.ts index 5f4a20b21e..30238c5d24 100644 --- a/v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/build-system.ts +++ b/v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/build-system.ts @@ -36,7 +36,10 @@ import debug from "debug"; import pMap from "p-map"; import { FileBuildResultType } from "../../../../types/solidity/build-system.js"; -import { DEFAULT_BUILD_PROFILE } from "../build-profiles.js"; +import { + DEFAULT_BUILD_PROFILE, + shouldMergeCompilationJobs, +} from "../build-profiles.js"; import { getArtifactsDeclarationFile, @@ -334,7 +337,10 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem { subgraphsWithConfig.push([configOrError, subgraph]); } - if (options?.mergeCompilationJobs === true) { + if ( + options?.mergeCompilationJobs ?? + shouldMergeCompilationJobs(buildProfileName) + ) { log(`Merging compilation jobs`); const mergedSubgraphsByConfig: Map< diff --git a/v-next/hardhat/src/internal/builtin-plugins/solidity/tasks/compile.ts b/v-next/hardhat/src/internal/builtin-plugins/solidity/tasks/compile.ts index 8bcb48e439..b7e793ad0e 100644 --- a/v-next/hardhat/src/internal/builtin-plugins/solidity/tasks/compile.ts +++ b/v-next/hardhat/src/internal/builtin-plugins/solidity/tasks/compile.ts @@ -2,7 +2,6 @@ import type { NewTaskActionFunction } from "../../../../types/tasks.js"; import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path"; -import { shouldMergeCompilationJobs } from "../build-profiles.js"; import { throwIfSolidityBuildFailed } from "../build-results.js"; import { isNpmRootPath } from "../build-system/root-paths-utils.js"; @@ -30,9 +29,6 @@ const compileAction: NewTaskActionFunction = async ( const results = await solidity.build(rootPaths, { force, buildProfile: globalOptions.buildProfile, - mergeCompilationJobs: shouldMergeCompilationJobs( - globalOptions.buildProfile, - ), quiet, });