From 8a0c5f5cae2d6cdc66315172d7ffdffc8954ffaa Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sat, 26 Jul 2025 15:15:56 -0700 Subject: Uses correct subpackage for server in ci and streams stdout and stderr during ci builds --- .ci/ci.cjs | 12 ++++++++++-- .ci/ci.ts | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to '.ci') diff --git a/.ci/ci.cjs b/.ci/ci.cjs index 323c561..8d183d4 100755 --- a/.ci/ci.cjs +++ b/.ci/ci.cjs @@ -477,7 +477,15 @@ var Optional = class _Optional extends _Tagged3 { }; // ../model/job/index.ts -var isJob = (j) => !!(isObject(j) && "arguments" in j && isObject(j.arguments) && "type" in j && typeof j.type === "string" && j); +var JobTypes = [ + "fetch_code", + "ci_pipeline", + "build_docker_image.js", + "ansible_playbook.js", + "checkout_ci.js" +]; +var isJobType = (j) => typeof j === "string" && JobTypes.includes(j); +var isJob = (j) => !!(isObject(j) && "arguments" in j && isObject(j.arguments) && "type" in j && isJobType(j.type) && j); // ../model/pipeline/builder.ts var BasePipelineBuilder = class { @@ -564,7 +572,7 @@ var getPipeline = () => { gitHookPipeline.addStage({ parallelJobs: [baseCiPackageBuild] }); - const subPackages = ["worker", "hooks"].map((_package) => ({ + const subPackages = ["worker", "server"].map((_package) => ({ type: "build_docker_image.js", arguments: { ...commonBuildArgs, diff --git a/.ci/ci.ts b/.ci/ci.ts index e2e375b..f634b21 100644 --- a/.ci/ci.ts +++ b/.ci/ci.ts @@ -5,6 +5,7 @@ import { BuildDockerImageJob, DefaultGitHookPipelineBuilder, FetchCodeJob, + Job, } from '@emprespresso/ci_model'; const REGISTRY = 'oci.liz.coffee'; @@ -37,7 +38,7 @@ const getPipeline = () => { parallelJobs: [baseCiPackageBuild], }); - const subPackages = ['worker', 'hooks'].map((_package) => ({ + const subPackages = ['worker', 'server'].map((_package) => ({ type: 'build_docker_image.js', arguments: { ...commonBuildArgs, -- cgit v1.2.3-70-g09d2