From f0898a3c19fafc5784385371beac6304b36f8f79 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sat, 26 Jul 2025 16:09:14 -0700 Subject: Turn off parallelism for image builds --- .ci/ci.cjs | 7 +------ .ci/ci.ts | 28 ++++++++++++++++------------ worker/scripts/build_docker_image.ts | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.ci/ci.cjs b/.ci/ci.cjs index 8d183d4..564ff20 100755 --- a/.ci/ci.cjs +++ b/.ci/ci.cjs @@ -303,9 +303,6 @@ var EmbeddedMetricsTraceable = class _EmbeddedMetricsTraceable extends Traceable }; // ../u/process/exec.ts -var import_node_util = require("node:util"); -var import_node_child_process = require("node:child_process"); -var exec = (0, import_node_util.promisify)(import_node_child_process.exec); var CmdMetric = Metric.fromName("Exec").asResult(); // ../u/process/signals.ts @@ -581,9 +578,7 @@ var getPipeline = () => { dockerfile: `${_package}/Dockerfile` } })); - gitHookPipeline.addStage({ - parallelJobs: subPackages - }); + subPackages.forEach((job) => gitHookPipeline.addStage({ parallelJobs: [job] })); const isRelease = branch === "release"; if (!isRelease) { return gitHookPipeline.build(); diff --git a/.ci/ci.ts b/.ci/ci.ts index f634b21..cd3cbb4 100644 --- a/.ci/ci.ts +++ b/.ci/ci.ts @@ -38,18 +38,22 @@ const getPipeline = () => { parallelJobs: [baseCiPackageBuild], }); - const subPackages = ['worker', 'server'].map((_package) => ({ - type: 'build_docker_image.js', - arguments: { - ...commonBuildArgs, - repository: `${IMG}_${_package}`, - buildTarget: _package, - dockerfile: `${_package}/Dockerfile`, - }, - })); - gitHookPipeline.addStage({ - parallelJobs: subPackages, - }); + const subPackages = ['worker', 'server'].map( + (_package) => + { + type: 'build_docker_image.js', + arguments: { + ...commonBuildArgs, + repository: `${IMG}_${_package}`, + buildTarget: _package, + dockerfile: `${_package}/Dockerfile`, + }, + }, + ); + subPackages.forEach((job) => gitHookPipeline.addStage({ parallelJobs: [job] })); + // gitHookPipeline.addStage({ + // parallelJobs: subPackages, + // }); const isRelease = branch === 'release'; if (!isRelease) { diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts index 8bac77d..6b4765c 100755 --- a/worker/scripts/build_docker_image.ts +++ b/worker/scripts/build_docker_image.ts @@ -80,10 +80,10 @@ await LogMetricTraceable.ofLogTraceable(_logJob) .peek(TraceUtil.promiseify(TraceUtil.traceResultingEither(loginMetric))) .map(async (tEitherWithAuthdRegistryBuildJob) => { const eitherWithAuthdRegistryBuildJob = await tEitherWithAuthdRegistryBuildJob.get(); - tEitherWithAuthdRegistryBuildJob.trace.trace('finally building the image~ (◕ᴗ◕✿)'); const eitherBuiltImage = await eitherWithAuthdRegistryBuildJob.flatMapAsync(({ arguments: args }) => tEitherWithAuthdRegistryBuildJob .move(getBuildCommand(args)) + .peek(t => t.trace.trace('finally building the image~ (◕ᴗ◕✿)')) .map((tBuildCmd) => getStdout(tBuildCmd, { env: {}, -- cgit v1.2.3-70-g09d2