Skip to content

Commit

Permalink
utils
Browse files Browse the repository at this point in the history
  • Loading branch information
pyramation committed May 3, 2024
1 parent fbf93b7 commit 484fc60
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions clients/js/packages/cli/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { StarshipContext } from '@starship-ci/client'; // Adjust the import path as necessary
import { defaultStarshipContext, StarshipContext } from '@starship-ci/client'; // Adjust the import path as necessary
import { StarshipConfig } from '@starship-ci/client';
import chalk from 'chalk';
import { readFileSync } from 'fs';
import * as yaml from 'js-yaml';
import { dirname, resolve } from 'path';

import { readAndParsePackageJson } from './package';
import deepmerge from 'deepmerge';

// Function to display the version information
export function displayVersion() {
Expand All @@ -32,7 +33,7 @@ export interface Config {

export const loadConfig = (argv: any): Config => {
if (argv.config) {
const context = loadYaml(argv.config) as StarshipContext
const context = deepmerge(defaultStarshipContext, loadYaml(argv.config)) as StarshipContext
if (context.helmFile) {
const dir = dirname(argv.config);
const configPath = resolve(resolvePath(dir), context.helmFile);
Expand Down

0 comments on commit 484fc60

Please sign in to comment.