Skip to content

Commit 33c92b6

Browse files
authored
Merge pull request #6416 from NomicFoundation/should-merge-compilation-jobs
chore: move shouldMergeCompilationJobs call to the build system
2 parents 25067ca + 4909f3f commit 33c92b6

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.changeset/selfish-worms-remain.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"hardhat": patch
3+
---
4+
5+
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.

v-next/hardhat/src/internal/builtin-plugins/solidity-test/task-action.ts

-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
1414
import { createNonClosingWriter } from "@nomicfoundation/hardhat-utils/stream";
1515
import chalk from "chalk";
1616

17-
import { shouldMergeCompilationJobs } from "../solidity/build-profiles.js";
1817
import {
1918
getArtifacts,
2019
getBuildInfos,
@@ -75,9 +74,6 @@ const runSolidityTests: NewTaskActionFunction<TestActionArguments> = async (
7574
const buildOptions: BuildOptions = {
7675
force: false,
7776
buildProfile: hre.globalOptions.buildProfile,
78-
mergeCompilationJobs: shouldMergeCompilationJobs(
79-
hre.globalOptions.buildProfile,
80-
),
8177
quiet: true,
8278
};
8379

v-next/hardhat/src/internal/builtin-plugins/solidity/build-system/build-system.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ import debug from "debug";
3636
import pMap from "p-map";
3737

3838
import { FileBuildResultType } from "../../../../types/solidity/build-system.js";
39-
import { DEFAULT_BUILD_PROFILE } from "../build-profiles.js";
39+
import {
40+
DEFAULT_BUILD_PROFILE,
41+
shouldMergeCompilationJobs,
42+
} from "../build-profiles.js";
4043

4144
import {
4245
getArtifactsDeclarationFile,
@@ -334,7 +337,10 @@ export class SolidityBuildSystemImplementation implements SolidityBuildSystem {
334337
subgraphsWithConfig.push([configOrError, subgraph]);
335338
}
336339

337-
if (options?.mergeCompilationJobs === true) {
340+
if (
341+
options?.mergeCompilationJobs ??
342+
shouldMergeCompilationJobs(buildProfileName)
343+
) {
338344
log(`Merging compilation jobs`);
339345

340346
const mergedSubgraphsByConfig: Map<

v-next/hardhat/src/internal/builtin-plugins/solidity/tasks/compile.ts

-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import type { NewTaskActionFunction } from "../../../../types/tasks.js";
22

33
import { resolveFromRoot } from "@nomicfoundation/hardhat-utils/path";
44

5-
import { shouldMergeCompilationJobs } from "../build-profiles.js";
65
import { throwIfSolidityBuildFailed } from "../build-results.js";
76
import { isNpmRootPath } from "../build-system/root-paths-utils.js";
87

@@ -30,9 +29,6 @@ const compileAction: NewTaskActionFunction<CompileActionArguments> = async (
3029
const results = await solidity.build(rootPaths, {
3130
force,
3231
buildProfile: globalOptions.buildProfile,
33-
mergeCompilationJobs: shouldMergeCompilationJobs(
34-
globalOptions.buildProfile,
35-
),
3632
quiet,
3733
});
3834

0 commit comments

Comments
 (0)