From cdefb26b6a3a359c5f4dbc1a16cf4327d0824774 Mon Sep 17 00:00:00 2001 From: luca <681992+lukka@users.noreply.github.com> Date: Thu, 4 May 2023 22:45:06 +0200 Subject: [PATCH] consume packages v3.7.0 --- dist/index.js | 171 ++++++++++++++++++++++++++++------------------ package-lock.json | 124 ++++++++++++++++----------------- package.json | 10 +-- 3 files changed, 170 insertions(+), 135 deletions(-) diff --git a/dist/index.js b/dist/index.js index f1997e6..42f79b2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -4177,7 +4177,7 @@ function copyFile(srcFile, destFile, force) { "use strict"; -// Copyright (c) 2019-2020-2021-2022 Luca Cappa +// Copyright (c) 2019-2020-2021-2022-2023 Luca Cappa // Released under the term specified in file LICENSE.txt // SPDX short identifier: MIT var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { @@ -4673,7 +4673,7 @@ __exportStar(__nccwpck_require__(7447), exports); "use strict"; -// Copyright (c) 2019-2020-2021-2022 Luca Cappa +// Copyright (c) 2019-2020-2021-2022-2023 Luca Cappa // Released under the term specified in file LICENSE.txt // SPDX short identifier: MIT var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { @@ -4840,12 +4840,12 @@ class BaseUtilLib { } return null; } - // Force 'name' env variable to have value of 'value'. + // Set both the environment variable and the workflow variable with the same name. + // The workflow variable might be re-used in subsequent steps. setEnvVar(name, value) { - // Set variable both as env var and as step variable, which might be re-used in subseqeunt steps. process.env[name] = value; this.baseLib.setVariable(name, value); - this.baseLib.debug(`Set variable and the env variable '${name}' to value '${value}'.`); + this.baseLib.debug(`Set env ariable and the workflow variable named '${name}' to value '${value}'.`); } trimString(value) { var _a; @@ -5361,34 +5361,8 @@ class CMakeRunner { if (this.configurePresetCmdStringAddArgs) { CMakeRunner.addArguments(cmake, this.configurePresetCmdStringAddArgs); } - yield this.baseUtils.wrapOp(`Setup C/C++ toolset environment variables`, () => __awaiter(this, void 0, void 0, function* () { - const vcpkgRoot = process.env[runvcpkglib.VCPKGROOT]; - // if VCPKG_ROOT is defined, then use it. - if (!vcpkgRoot || vcpkgRoot.length == 0) { - this.baseLib.info(`Skipping setting up the environment since VCPKG_ROOT is not defined. It is needed to know where vcpkg executable is located.`); - } - else if (!this.baseUtils.isWin32()) { - this.baseLib.info(`Skipping setting up the environment since the platform is not Windows.`); - } - else if (process.env.CXX || process.env.CC) { - // If a C++ compiler is user-enforced, skip setting up the environment for MSVC. - this.baseLib.info(`Skipping setting up the environment since CXX or CC environment variable are defined. This allows user customization.`); - } - else { - // If Win32 && (!CC && !CXX), let hardcode CC and CXX so that CMake uses the MSVC toolset. - process.env['CC'] = "cl.exe"; - process.env['CXX'] = "cl.exe"; - this.baseLib.setVariable("CC", "cl.exe"); - this.baseLib.setVariable("CXX", "cl.exe"); - // Use vcpkg to set the environment using provided command line (which includes the triplet). - // This is only useful to setup the environment for MSVC on Windows. - baseutillib.setEnvVarIfUndefined(runvcpkglib.VCPKGDEFAULTTRIPLET, this.baseUtils.getDefaultTriplet()); - const vcpkgEnvArgsString = baseutillib.replaceFromEnvVar(this.vcpkgEnvStringFormat); - const vcpkgEnvArgs = eval(vcpkgEnvArgsString); - this.baseLib.debug(`'vcpkg env' arguments: ${vcpkgEnvArgs}`); - yield cmakeutil.injectEnvVariables(this.baseUtils, vcpkgRoot, vcpkgEnvArgs); - } - })); + const vcpkgRoot = process.env[runvcpkglib.VCPKGROOT]; + yield cmakeutil.setupMsvc(this.baseUtils, vcpkgRoot, this.vcpkgEnvStringFormat); // this.baseLib.debug(`Generating project files with CMake ...`); yield this.baseUtils.wrapOp("Generate project files with CMake", () => __awaiter(this, void 0, void 0, function* () { return yield this.launchTool(cmake, this.cmakeSourceDir, this.logFilesCollector); })); @@ -5452,7 +5426,7 @@ CMakeRunner.vcpkgEnvDefault = "[`env`, `--bin`, `--include`, `--tools`, `--pytho "use strict"; -// Copyright (c) 2019-2020-2021-2022 Luca Cappa +// Copyright (c) 2019-2020-2021-2022-2023 Luca Cappa // Released under the term specified in file LICENSE.txt // SPDX short identifier: MIT var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { @@ -5484,48 +5458,109 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.injectEnvVariables = void 0; -const cmakeutil = __importStar(__nccwpck_require__(1017)); +exports.setupMsvc = exports.injectEnvVariables = exports.getVcpkgExePath = void 0; +const baseutillib = __importStar(__nccwpck_require__(2365)); +const cmakeutil = __importStar(__nccwpck_require__(4067)); +const path = __importStar(__nccwpck_require__(1017)); +const runvcpkglib = __importStar(__nccwpck_require__(4393)); +function getVcpkgExePath(baseUtils, vcpkgRoot) { + // Search for vcpkg tool and run it + let vcpkgPath = path.join(vcpkgRoot, 'vcpkg'); + if (baseUtils.isWin32()) { + vcpkgPath += '.exe'; + } + return vcpkgPath; +} +exports.getVcpkgExePath = getVcpkgExePath; function injectEnvVariables(baseUtils, vcpkgRoot, args) { return __awaiter(this, void 0, void 0, function* () { - // Search for vcpkg tool and run it - let vcpkgPath = cmakeutil.join(vcpkgRoot, 'vcpkg'); - if (baseUtils.isWin32()) { - vcpkgPath += '.exe'; - } - const vcpkg = baseUtils.baseLib.tool(vcpkgPath); - for (const arg of args) { - vcpkg.arg(arg); - } - const options = { - cwd: vcpkgRoot, - failOnStdErr: false, - errStream: process.stdout, - outStream: process.stdout, - ignoreReturnCode: true, - silent: false, - windowsVerbatimArguments: false, - env: process.env - }; - const output = yield vcpkg.execSync(options); - if (output.code !== 0) { - throw new Error(`${output.stdout}\n\n${output.stderr}`); - } - const map = baseUtils.parseVcpkgEnvOutput(output.stdout); - for (const key in map) { - if (baseUtils.isVariableStrippingPath(key)) - continue; - if (key.toUpperCase() === "PATH") { - process.env[key] = process.env[key] + cmakeutil.delimiter + map[key]; + try { + baseUtils.baseLib.debug(`injectEnvVariables()<<`); + const vcpkgPath = getVcpkgExePath(baseUtils, vcpkgRoot); + const vcpkg = baseUtils.baseLib.tool(vcpkgPath); + for (const arg of args) { + vcpkg.arg(arg); } - else { - process.env[key] = map[key]; + const options = { + cwd: vcpkgRoot, + failOnStdErr: false, + errStream: process.stdout, + outStream: process.stdout, + ignoreReturnCode: true, + silent: false, + windowsVerbatimArguments: false, + env: process.env + }; + const output = yield vcpkg.execSync(options); + if (output.code !== 0) { + throw new Error(`vcpkg failed with: ${output.stdout}\n\n${output.stderr}`); + } + const map = baseUtils.parseVcpkgEnvOutput(output.stdout); + for (const key in map) { + let newValue; + if (baseUtils.isVariableStrippingPath(key)) + continue; + if (key.toUpperCase() === "PATH") { + newValue = process.env[key] + path.delimiter + map[key]; + } + else { + newValue = map[key]; + } + if (!newValue) + baseUtils.baseLib.warning(`The value for '${key}' cannot be determined.`); + else { + baseUtils.setEnvVar(key, newValue); + baseUtils.baseLib.debug(`set ${key}=${newValue}`); + } } - baseUtils.baseLib.debug(`set ${key}=${process.env[key]}`); + } + finally { + baseUtils.baseLib.debug(`injectEnvVariables()>>`); } }); } exports.injectEnvVariables = injectEnvVariables; +function setupMsvc(baseUtils, vcpkgRoot, vcpkgEnvStringFormat) { + return __awaiter(this, void 0, void 0, function* () { + if (!baseUtils.isWin32()) { + baseUtils.baseLib.debug(`Skipping setting up the environment since the platform is not Windows.`); + } + else { + yield baseUtils.wrapOp(`Setup MSVC C/C++ toolset environment variables`, () => __awaiter(this, void 0, void 0, function* () { + if (!vcpkgRoot || vcpkgRoot.length == 0) { + baseUtils.baseLib.info(`Skipping setting up the environment since VCPKG_ROOT is not defined, and it is required to locate the vcpkg executable which provides the environment variables to be set for MSVC.`); + const vcpkgRoot = process.env[runvcpkglib.VCPKGROOT]; + } + else { + // if VCPKG_ROOT is defined, then use vcpkg to setup the environment. + if (process.env.CXX || process.env.CC) { + // If a C++ compiler is user-enforced, skip setting up the environment for MSVC. + baseUtils.baseLib.info(`Skipping setting up the environment since CXX or CC environment variables are defined. This allows user customization of used MSVC version.`); + } + else { + const vcpkgPath = cmakeutil.getVcpkgExePath(baseUtils, vcpkgRoot); + if (!vcpkgPath || !baseUtils.fileExists(vcpkgPath)) { + baseUtils.baseLib.warning(`Skipping setting up the environment since vcpkg's executable is not found at: '${vcpkgPath}'.`); + } + else { + // If defined(Win32) && (!defined(CC) && !defined(CXX)), let's hardcode CC and CXX so that CMake uses the MSVC toolset. + baseUtils.setEnvVar('CC', "cl.exe"); + baseUtils.setEnvVar('CXX', "cl.exe"); + // Use vcpkg to set the environment using provided command line (which includes the triplet). + // This is only useful to setup the environment for MSVC on Windows. + baseutillib.setEnvVarIfUndefined(runvcpkglib.VCPKGDEFAULTTRIPLET, baseUtils.getDefaultTriplet()); + const vcpkgEnvArgsString = baseutillib.replaceFromEnvVar(vcpkgEnvStringFormat); + const vcpkgEnvArgs = eval(vcpkgEnvArgsString); + baseUtils.baseLib.debug(`'vcpkg env' arguments: ${vcpkgEnvArgs}`); + yield cmakeutil.injectEnvVariables(baseUtils, vcpkgRoot, vcpkgEnvArgs); + } + } + } + })); + } + }); +} +exports.setupMsvc = setupMsvc; //# sourceMappingURL=cmake-utils.js.map /***/ }), diff --git a/package-lock.json b/package-lock.json index 912ca11..ab17dd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,11 +13,11 @@ "@actions/exec": "^1.0.3", "@actions/github": "^4.0.0", "@actions/io": "^1.0.2", - "@lukka/action-lib": "3.6.2", - "@lukka/assets-lib": "3.6.2", - "@lukka/base-lib": "3.6.2", - "@lukka/base-util-lib": "3.6.2", - "@lukka/run-cmake-lib": "3.6.2", + "@lukka/action-lib": "3.7.0", + "@lukka/assets-lib": "3.7.0", + "@lukka/base-lib": "3.7.0", + "@lukka/base-util-lib": "3.7.0", + "@lukka/run-cmake-lib": "3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.8.0", "@types/jest": "^26.0.14", @@ -1620,9 +1620,9 @@ } }, "node_modules/@lukka/action-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/action-lib/3.6.2/648a1cbb5d8771f29bbe93aca23dc42fefd94fce", - "integrity": "sha512-znHVgSJMlR1vHnLmu/8dam/BnOVtuEi3GIK+/hETMbZ6WAIDLwa6/djPml79Hx51LgeBCOOMO7vooZ+zyzUdTA==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/action-lib/3.7.0/e8197875f742762c5879001d4efcf3d8ea753f61", + "integrity": "sha512-GK5iXxZealMZbJhf7dsTHSziLLsR2xmO5ddGcHVha6WGs2O+bGGwb9IgC7luGtWdF9VFz+hvDSKPlfaZgbuXSg==", "license": "MIT", "dependencies": { "@actions/core": "^1.9.1", @@ -1630,8 +1630,8 @@ "@actions/github": "^5.0.3", "@actions/glob": "^0.3.0", "@actions/io": "^1.1.2", - "@lukka/base-lib": "^3.6.2", - "@lukka/base-util-lib": "^3.6.2", + "@lukka/base-lib": "^3.7.0", + "@lukka/base-util-lib": "^3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", "@types/q": "^1.5.1", @@ -1840,15 +1840,15 @@ } }, "node_modules/@lukka/assets-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/assets-lib/3.6.2/ad719f9c6673f37ddfd420316f5cd8d1e1d7920e", - "integrity": "sha512-NSoKN2s2MtUlicXYkQAM1uC90+bnEQxzEbAuxAcfXoyWo+LWFJUnu4W0d5HgMJUrbH+i88HHcyFpCRn+Si/aMg==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/assets-lib/3.7.0/0078dcbbf2d1887cd1420dc650d1cb7bc25c6cd0", + "integrity": "sha512-KbhRdPlJlAa3BLiXmeExfspBoc6DkPWGugiWkB74S4JxA6shmqgLR7DAo+yf/9bF4h1bA1QJ/6Ni9SQQ/pKpAQ==", "license": "MIT" }, "node_modules/@lukka/base-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/base-lib/3.6.2/86d4724123a058d7770fc033b5516c4c1fb59392", - "integrity": "sha512-41oZ2jBFYeDk+erVCyQWisYrCUL15Iexc0xyfMid78wlcLYfFidmU6dqZX47/TcYNUa7q9J5/Z26Wy7IxVpqBg==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/base-lib/3.7.0/ef5955193b24dfbc6326908132ea46347ff0e3a4", + "integrity": "sha512-YOZQ5zuTwH8hZqXgcGH6TtctNQgi/aqu2HKRPS2wY7htpUsknZm0AKijbPFlTrQ/zFrEx/4ffg+5i9x5Rajb5Q==", "license": "MIT", "dependencies": { "@types/adm-zip": "^0.4.32", @@ -2028,25 +2028,25 @@ } }, "node_modules/@lukka/base-util-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/base-util-lib/3.6.2/d11111c00ac74473f7216ac25196b0c6639c98f6", - "integrity": "sha512-VgkF/EuRBhr0vIlT4C7mwZmo2zFJHinaSwmi+qjhQhUBntUnHoIRNwMKR3uI2bmp2EhpqcF/yfoiiNLkNyJdBA==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/base-util-lib/3.7.0/2bad000a5cea5fbefba16fe8599b7be092825a82", + "integrity": "sha512-VYCERdXrGnYgrO+ZfJnhd2HMTaR0EhKoBphh9bhzZjjUZazkIGHYj1L8GbrDmQqIrrLZpO64+gxIKGRFYEz5DA==", "license": "MIT", "dependencies": { - "@lukka/base-lib": "^3.6.2", + "@lukka/base-lib": "^3.7.0", "fast-glob": "3.2.7" } }, "node_modules/@lukka/run-cmake-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/run-cmake-lib/3.6.2/8f408374137dab906a800263974ce0bed75e1aa2", - "integrity": "sha512-/lMJhWmlsX8DIdbSLQku0RGwqfZJp608KOLVaCMiD9Dci2vqOY6pF7PuuOwJZM1zuyVOj1qkL1TAtLHhFjsMAQ==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/run-cmake-lib/3.7.0/5307e5c6715f98f4f2a2a035695a24a914c91d90", + "integrity": "sha512-schGI6QaTwBrZIWcI0LwUW7lW364ggrFp+RXCRrMIRqH6bZMrZMoQjYQjjx6HGDV5l7xSBPd82lyKg9fq8b+Fw==", "license": "MIT", "dependencies": { - "@lukka/action-lib": "^3.6.2", - "@lukka/base-lib": "^3.6.2", - "@lukka/base-util-lib": "^3.6.2", - "@lukka/run-vcpkg-lib": "^3.6.2", + "@lukka/action-lib": "^3.7.0", + "@lukka/base-lib": "^3.7.0", + "@lukka/base-util-lib": "^3.7.0", + "@lukka/run-vcpkg-lib": "^3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", "@types/q": "^1.5.1", @@ -2226,14 +2226,14 @@ } }, "node_modules/@lukka/run-vcpkg-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/run-vcpkg-lib/3.6.2/9f2de7031cdd590fcae174583bb4f69911814911", - "integrity": "sha512-sknb0zJX7wv5JAmgStoKiCqPPwpMUCaRJ51xfcqxDabygnrlfm/nWn5vK2GcruJpUq8ufMu2WNGWFQvHtMOmgg==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/run-vcpkg-lib/3.7.0/ecf3d75219bf569748aa448736cbf940fc25a2e8", + "integrity": "sha512-P0Xya7qn3zBmcyy6FQ5YHF/VMxLFiYRmVydprvCe33mqL2mudpv3robpmeqrLMsxdLS37VZH1tB1l27oSmCPpg==", "license": "MIT", "dependencies": { - "@lukka/action-lib": "^3.6.2", - "@lukka/base-lib": "^3.6.2", - "@lukka/base-util-lib": "^3.6.2", + "@lukka/action-lib": "^3.7.0", + "@lukka/base-lib": "^3.7.0", + "@lukka/base-util-lib": "^3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", "@types/q": "^1.5.1", @@ -16349,17 +16349,17 @@ } }, "@lukka/action-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/action-lib/3.6.2/648a1cbb5d8771f29bbe93aca23dc42fefd94fce", - "integrity": "sha512-znHVgSJMlR1vHnLmu/8dam/BnOVtuEi3GIK+/hETMbZ6WAIDLwa6/djPml79Hx51LgeBCOOMO7vooZ+zyzUdTA==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/action-lib/3.7.0/e8197875f742762c5879001d4efcf3d8ea753f61", + "integrity": "sha512-GK5iXxZealMZbJhf7dsTHSziLLsR2xmO5ddGcHVha6WGs2O+bGGwb9IgC7luGtWdF9VFz+hvDSKPlfaZgbuXSg==", "requires": { "@actions/core": "^1.9.1", "@actions/exec": "^1.1.1", "@actions/github": "^5.0.3", "@actions/glob": "^0.3.0", "@actions/io": "^1.1.2", - "@lukka/base-lib": "^3.6.2", - "@lukka/base-util-lib": "^3.6.2", + "@lukka/base-lib": "^3.7.0", + "@lukka/base-util-lib": "^3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", "@types/q": "^1.5.1", @@ -16522,14 +16522,14 @@ } }, "@lukka/assets-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/assets-lib/3.6.2/ad719f9c6673f37ddfd420316f5cd8d1e1d7920e", - "integrity": "sha512-NSoKN2s2MtUlicXYkQAM1uC90+bnEQxzEbAuxAcfXoyWo+LWFJUnu4W0d5HgMJUrbH+i88HHcyFpCRn+Si/aMg==" + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/assets-lib/3.7.0/0078dcbbf2d1887cd1420dc650d1cb7bc25c6cd0", + "integrity": "sha512-KbhRdPlJlAa3BLiXmeExfspBoc6DkPWGugiWkB74S4JxA6shmqgLR7DAo+yf/9bF4h1bA1QJ/6Ni9SQQ/pKpAQ==" }, "@lukka/base-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/base-lib/3.6.2/86d4724123a058d7770fc033b5516c4c1fb59392", - "integrity": "sha512-41oZ2jBFYeDk+erVCyQWisYrCUL15Iexc0xyfMid78wlcLYfFidmU6dqZX47/TcYNUa7q9J5/Z26Wy7IxVpqBg==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/base-lib/3.7.0/ef5955193b24dfbc6326908132ea46347ff0e3a4", + "integrity": "sha512-YOZQ5zuTwH8hZqXgcGH6TtctNQgi/aqu2HKRPS2wY7htpUsknZm0AKijbPFlTrQ/zFrEx/4ffg+5i9x5Rajb5Q==", "requires": { "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", @@ -16665,23 +16665,23 @@ } }, "@lukka/base-util-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/base-util-lib/3.6.2/d11111c00ac74473f7216ac25196b0c6639c98f6", - "integrity": "sha512-VgkF/EuRBhr0vIlT4C7mwZmo2zFJHinaSwmi+qjhQhUBntUnHoIRNwMKR3uI2bmp2EhpqcF/yfoiiNLkNyJdBA==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/base-util-lib/3.7.0/2bad000a5cea5fbefba16fe8599b7be092825a82", + "integrity": "sha512-VYCERdXrGnYgrO+ZfJnhd2HMTaR0EhKoBphh9bhzZjjUZazkIGHYj1L8GbrDmQqIrrLZpO64+gxIKGRFYEz5DA==", "requires": { - "@lukka/base-lib": "^3.6.2", + "@lukka/base-lib": "^3.7.0", "fast-glob": "3.2.7" } }, "@lukka/run-cmake-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/run-cmake-lib/3.6.2/8f408374137dab906a800263974ce0bed75e1aa2", - "integrity": "sha512-/lMJhWmlsX8DIdbSLQku0RGwqfZJp608KOLVaCMiD9Dci2vqOY6pF7PuuOwJZM1zuyVOj1qkL1TAtLHhFjsMAQ==", - "requires": { - "@lukka/action-lib": "^3.6.2", - "@lukka/base-lib": "^3.6.2", - "@lukka/base-util-lib": "^3.6.2", - "@lukka/run-vcpkg-lib": "^3.6.2", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/run-cmake-lib/3.7.0/5307e5c6715f98f4f2a2a035695a24a914c91d90", + "integrity": "sha512-schGI6QaTwBrZIWcI0LwUW7lW364ggrFp+RXCRrMIRqH6bZMrZMoQjYQjjx6HGDV5l7xSBPd82lyKg9fq8b+Fw==", + "requires": { + "@lukka/action-lib": "^3.7.0", + "@lukka/base-lib": "^3.7.0", + "@lukka/base-util-lib": "^3.7.0", + "@lukka/run-vcpkg-lib": "^3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", "@types/q": "^1.5.1", @@ -16818,13 +16818,13 @@ } }, "@lukka/run-vcpkg-lib": { - "version": "3.6.2", - "resolved": "https://npm.pkg.github.com/download/@lukka/run-vcpkg-lib/3.6.2/9f2de7031cdd590fcae174583bb4f69911814911", - "integrity": "sha512-sknb0zJX7wv5JAmgStoKiCqPPwpMUCaRJ51xfcqxDabygnrlfm/nWn5vK2GcruJpUq8ufMu2WNGWFQvHtMOmgg==", + "version": "3.7.0", + "resolved": "https://npm.pkg.github.com/download/@lukka/run-vcpkg-lib/3.7.0/ecf3d75219bf569748aa448736cbf940fc25a2e8", + "integrity": "sha512-P0Xya7qn3zBmcyy6FQ5YHF/VMxLFiYRmVydprvCe33mqL2mudpv3robpmeqrLMsxdLS37VZH1tB1l27oSmCPpg==", "requires": { - "@lukka/action-lib": "^3.6.2", - "@lukka/base-lib": "^3.6.2", - "@lukka/base-util-lib": "^3.6.2", + "@lukka/action-lib": "^3.7.0", + "@lukka/base-lib": "^3.7.0", + "@lukka/base-util-lib": "^3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.14.1", "@types/q": "^1.5.1", diff --git a/package.json b/package.json index 1147c7b..24d2977 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,11 @@ "@actions/exec": "^1.0.3", "@actions/github": "^4.0.0", "@actions/io": "^1.0.2", - "@lukka/action-lib": "3.6.2", - "@lukka/assets-lib": "3.6.2", - "@lukka/base-lib": "3.6.2", - "@lukka/base-util-lib": "3.6.2", - "@lukka/run-cmake-lib": "3.6.2", + "@lukka/action-lib": "3.7.0", + "@lukka/assets-lib": "3.7.0", + "@lukka/base-lib": "3.7.0", + "@lukka/base-util-lib": "3.7.0", + "@lukka/run-cmake-lib": "3.7.0", "@types/adm-zip": "^0.4.32", "@types/follow-redirects": "^1.8.0", "@types/jest": "^26.0.14",