From 5eb1e7e8808d4de353c1a0bc87b2f5d078882d3a Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sun, 29 Jun 2025 19:46:30 -0700 Subject: Deployment fixes --- model/job/jobs.ts | 8 ++++---- model/pipeline/builder.ts | 7 +++---- model/pipeline/index.ts | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'model') diff --git a/model/job/jobs.ts b/model/job/jobs.ts index e201c4d..4ed5858 100644 --- a/model/job/jobs.ts +++ b/model/job/jobs.ts @@ -7,7 +7,7 @@ export interface FetchCodeJobProps extends JobArgT { } export interface FetchCodeJob { - readonly type: 'fetch_code.ts'; + readonly type: 'fetch_code.js'; readonly arguments: FetchCodeJobProps; } @@ -23,7 +23,7 @@ export interface BuildDockerImageJobProps extends JobArgT { } export interface BuildDockerImageJob extends Job { - readonly type: 'build_docker_image.ts'; + readonly type: 'build_docker_image.js'; readonly arguments: BuildDockerImageJobProps; } @@ -33,7 +33,7 @@ export interface AnsiblePlaybookJobProps extends JobArgT { } export interface AnsiblePlaybookJob extends Job { - readonly type: 'ansible_playbook.ts'; + readonly type: 'ansible_playbook.js'; readonly arguments: AnsiblePlaybookJobProps; } @@ -47,6 +47,6 @@ export interface CheckoutCiJobProps extends JobArgT { } export interface CheckoutCiJob extends Job { - readonly type: 'checkout_ci.ts'; + readonly type: 'checkout_ci.js'; readonly arguments: CheckoutCiJobProps; } diff --git a/model/pipeline/builder.ts b/model/pipeline/builder.ts index dac9452..c30867c 100644 --- a/model/pipeline/builder.ts +++ b/model/pipeline/builder.ts @@ -1,6 +1,5 @@ -import { Pipeline, PipelineStage } from './index.js'; -import { FetchCodeJob } from '../job/index.js'; -import { PipelineImpl } from './impl.js'; +import { FetchCodeJob } from '@emprespresso/ci_model'; +import { PipelineImpl, Pipeline, PipelineStage } from './index.js'; export interface PipelineBuilder { addStage(stage: PipelineStage): PipelineBuilder; @@ -31,7 +30,7 @@ export class DefaultGitHookPipelineBuilder extends BasePipelineBuilder { this.addStage({ parallelJobs: [ { - type: 'fetch_code.ts', + type: 'fetch_code.js', arguments: { remoteUrl, checkout: rev, diff --git a/model/pipeline/index.ts b/model/pipeline/index.ts index fd14e8d..1c10c64 100644 --- a/model/pipeline/index.ts +++ b/model/pipeline/index.ts @@ -1,5 +1,5 @@ import { isObject } from '@emprespresso/pengueno'; -import { isJob, Job } from '../job/index.js'; +import { isJob, Job } from '@emprespresso/ci_model'; export interface PipelineStage { readonly parallelJobs: Array; -- cgit v1.2.3-70-g09d2