Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit f56a1e6
Author: dappnodedev <[email protected]>
Date:   Tue Mar 12 14:48:10 2024 +0100

    Add template mode to build command (#398)

    * Add build args for template mode and variants

    * Merge manifest and compose files

    * Build package variants

    * Build all variants if none is defined

    * Show DNP name on build

    * Separate build dirs

    * Fix build test

    * Improve build handler style

    * Perform modifications based on review

    * Improve error handling in compose load

    * Squashed commit of the following:

    commit 28cae58
    Merge: dddaec8 ff912ae
    Author: dappnodedev <[email protected]>
    Date:   Tue Mar 12 12:15:35 2024 +0100

        Merge pull request #402 from dappnode/dappnodedev/bump-js-yaml-version

        Bump js-yaml to 4.1.0

    commit ff912ae
    Author: dappnodedev <[email protected]>
    Date:   Mon Mar 11 17:58:03 2024 +0100

        Bump js-yaml to 4.1.0

    * Replace template flag by variants or all-variants

    * Add templateMode flag to buildAndUpload

    * Add templateMode flag to build call

commit 28cae58
Merge: dddaec8 ff912ae
Author: dappnodedev <[email protected]>
Date:   Tue Mar 12 12:15:35 2024 +0100

    Merge pull request #402 from dappnode/dappnodedev/bump-js-yaml-version

    Bump js-yaml to 4.1.0

commit ff912ae
Author: dappnodedev <[email protected]>
Date:   Mon Mar 11 17:58:03 2024 +0100

    Bump js-yaml to 4.1.0
  • Loading branch information
dappnodedev committed Mar 13, 2024
1 parent 1967a73 commit 26d0432
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 2 additions & 5 deletions src/files/manifest/readManifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ import { merge } from "lodash-es";
/**
* Reads a manifest and optionally merges it with a variant manifest.
*/
export function readManifest({
paths,
variantPaths
}: {
export function readManifest(
paths?: ManifestPaths,
variantPaths?: ManifestPaths
}): { manifest: Manifest; format: ManifestFormat } {
): { manifest: Manifest; format: ManifestFormat } {
try {
const manifest = loadManifest(paths);

Expand Down
2 changes: 1 addition & 1 deletion src/tasks/buildAndUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function buildAndUpload({
const variantPaths = templateMode && variantName ? { dir: path.join(variantsDirPath, variantName) } : undefined;

// Load manifest #### Todo: Deleted check functions. Verify manifest beforehand
const { manifest, format } = readManifest({ paths: { dir }, variantPaths });
const { manifest, format } = readManifest({ dir }, variantPaths);

// Make sure the release is of correct type
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down

0 comments on commit 26d0432

Please sign in to comment.