Skip to content

Commit

Permalink
Merge 29379f6 into bd97429
Browse files Browse the repository at this point in the history
  • Loading branch information
lukka committed Mar 24, 2023
2 parents bd97429 + 29379f6 commit 8b1cb7e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion dist/index.js
Expand Up @@ -219,7 +219,9 @@ class VcpkgAction {
vcpkgJsonPath = vcpkgJsonFile === null ? null : path.dirname(path.resolve(vcpkgJsonFile));
this.baseUtilLib.baseLib.debug(`vcpkgJsonFile = '${vcpkgJsonFile}', vcpkgJsonPath = '${vcpkgJsonPath}'.`);
if (vcpkgJsonPath === null) {
this.baseUtilLib.baseLib.warning(`The current directory for running the command '${this.runVcpkgFormatString}' is unknown.'`);
this.baseUtilLib.baseLib.error(`Failing the workflow since the 'vcpkg.json' file has not been found, and its containing directory
is required and used as the 'working directory' when launching vcpkg with arguments:
'${this.runVcpkgFormatString}'. `);
}
}
this.baseUtilLib.baseLib.debug(`getCurrentDirectoryForRunningVcpkg()>> -> ${vcpkgJsonPath}`);
Expand Down
4 changes: 3 additions & 1 deletion dist/post/index.js
Expand Up @@ -226,7 +226,9 @@ class VcpkgAction {
vcpkgJsonPath = vcpkgJsonFile === null ? null : path.dirname(path.resolve(vcpkgJsonFile));
this.baseUtilLib.baseLib.debug(`vcpkgJsonFile = '${vcpkgJsonFile}', vcpkgJsonPath = '${vcpkgJsonPath}'.`);
if (vcpkgJsonPath === null) {
this.baseUtilLib.baseLib.warning(`The current directory for running the command '${this.runVcpkgFormatString}' is unknown.'`);
this.baseUtilLib.baseLib.error(`Failing the workflow since the 'vcpkg.json' file has not been found, and its containing directory
is required and used as the 'working directory' when launching vcpkg with arguments:
'${this.runVcpkgFormatString}'. `);
}
}
this.baseUtilLib.baseLib.debug(`getCurrentDirectoryForRunningVcpkg()>> -> ${vcpkgJsonPath}`);
Expand Down
4 changes: 3 additions & 1 deletion src/vcpkg-action.ts
Expand Up @@ -192,7 +192,9 @@ export class VcpkgAction {
vcpkgJsonPath = vcpkgJsonFile === null ? null : path.dirname(path.resolve(vcpkgJsonFile));
this.baseUtilLib.baseLib.debug(`vcpkgJsonFile = '${vcpkgJsonFile}', vcpkgJsonPath = '${vcpkgJsonPath}'.`);
if (vcpkgJsonPath === null) {
this.baseUtilLib.baseLib.warning(`The current directory for running the command '${this.runVcpkgFormatString}' is unknown.'`);
this.baseUtilLib.baseLib.error(`Failing the workflow since the 'vcpkg.json' file has not been found, and its containing directory
is required and used as the 'working directory' when launching vcpkg with arguments:
'${this.runVcpkgFormatString}'. `);
}
}

Expand Down

0 comments on commit 8b1cb7e

Please sign in to comment.