Skip to content

Commit e6f2e16

Browse files
committed
consume latest packages v3.6.2
1 parent 1e613c0 commit e6f2e16

File tree

3 files changed

+95
-70
lines changed

3 files changed

+95
-70
lines changed

dist/index.js

+29-4
Original file line numberDiff line numberDiff line change
@@ -4969,6 +4969,26 @@ class BaseUtilLib {
49694969
this.baseLib.info(`Set the step output variable '${name}' to value '${value}''`);
49704970
this.baseLib.setOutput(name, value);
49714971
}
4972+
/**
4973+
* Set a workflow variable if not set already.
4974+
* @param name The name of the variable.
4975+
* @param value The value.
4976+
*/
4977+
setVariableIfUndefined(name, value) {
4978+
this.baseLib.debug(`setVariableIfUndefined()<<`);
4979+
if (!process.env[name]) {
4980+
if (!value) {
4981+
this.baseLib.warning(`Cannot set '${name}' variable because the provided value is null.`);
4982+
}
4983+
else {
4984+
this.setVariableVerbose(name, value);
4985+
}
4986+
}
4987+
else {
4988+
this.baseLib.debug(`${name} is already set to: '${value}'`);
4989+
}
4990+
this.baseLib.debug(`setVariableIfUndefined()>>`);
4991+
}
49724992
}
49734993
exports.BaseUtilLib = BaseUtilLib;
49744994
class Matcher {
@@ -5585,7 +5605,7 @@ __exportStar(__nccwpck_require__(6188), exports);
55855605
// Released under the term specified in file LICENSE.txt
55865606
// SPDX short identifier: MIT
55875607
Object.defineProperty(exports, "__esModule", ({ value: true }));
5588-
exports.VCPKG_BINARY_SOURCES = exports.VCPKG_INSTALLED_DIR = exports.VCPKG_JSON = exports.VCPKGDEFAULTTRIPLET = exports.VCPKGROOT = exports.vcpkgLastBuiltCommitId = exports.RUNVCPKG_VCPKG_DEFAULT_TRIPLET = exports.RUNVCPKG_VCPKG_ROOT = void 0;
5608+
exports.ACTIONS_RUNTIME_TOKEN = exports.ACTIONS_CACHE_URL = exports.VCPKG_BINARY_SOURCES = exports.VCPKG_INSTALLED_DIR = exports.VCPKG_JSON = exports.VCPKGDEFAULTTRIPLET = exports.VCPKGROOT = exports.vcpkgLastBuiltCommitId = exports.RUNVCPKG_VCPKG_DEFAULT_TRIPLET = exports.RUNVCPKG_VCPKG_ROOT = void 0;
55895609
exports.RUNVCPKG_VCPKG_ROOT = "RUNVCPKG_VCPKG_ROOT";
55905610
exports.RUNVCPKG_VCPKG_DEFAULT_TRIPLET = "RUNVCPKG_VCPKG_DEFAULT_TRIPLET";
55915611
exports.vcpkgLastBuiltCommitId = 'vcpkgLastBuiltCommitId';
@@ -5594,6 +5614,8 @@ exports.VCPKGDEFAULTTRIPLET = "VCPKG_DEFAULT_TRIPLET";
55945614
exports.VCPKG_JSON = "vcpkg.json";
55955615
exports.VCPKG_INSTALLED_DIR = "VCPKG_INSTALLED_DIR";
55965616
exports.VCPKG_BINARY_SOURCES = `VCPKG_BINARY_SOURCES`;
5617+
exports.ACTIONS_CACHE_URL = `ACTIONS_CACHE_URL`;
5618+
exports.ACTIONS_RUNTIME_TOKEN = `ACTIONS_RUNTIME_TOKEN`;
55975619
//# sourceMappingURL=vcpkg-globals.js.map
55985620

55995621
/***/ }),
@@ -5718,9 +5740,12 @@ class VcpkgRunner {
57185740
// If running in a GitHub Runner, enable the GH's cache provider for the vcpkg's binary cache.
57195741
if (process.env['GITHUB_ACTIONS'] === 'true') {
57205742
yield this.baseUtils.wrapOp(`Setup to run on GitHub Action runners`, () => __awaiter(this, void 0, void 0, function* () {
5721-
// Allow users to define the vcpkg's binary source explicitly in the workflow, in that case don't override it.
5722-
if (!process.env[globals.VCPKG_BINARY_SOURCES])
5723-
this.baseUtils.setVariableVerbose(globals.VCPKG_BINARY_SOURCES, VcpkgRunner.VCPKG_BINARY_SOURCES_GHA);
5743+
// Allow users to define the vcpkg's binary source explicitly in the workflow, in that case do not override it.
5744+
this.baseUtils.setVariableIfUndefined(globals.VCPKG_BINARY_SOURCES, VcpkgRunner.VCPKG_BINARY_SOURCES_GHA);
5745+
if (process.env.ACTIONS_CACHE_URL)
5746+
this.baseUtils.setVariableVerbose(globals.ACTIONS_CACHE_URL, process.env.ACTIONS_CACHE_URL);
5747+
if (process.env.ACTIONS_RUNTIME_TOKEN)
5748+
this.baseUtils.setVariableVerbose(globals.ACTIONS_RUNTIME_TOKEN, process.env.ACTIONS_RUNTIME_TOKEN);
57245749
}));
57255750
}
57265751
// Ensuring `this.vcpkgDestPath` is existent, since is going to be used as current working directory.

package-lock.json

+61-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"@actions/exec": "^1.0.3",
4444
"@actions/github": "^4.0.0",
4545
"@actions/io": "^1.0.2",
46-
"@lukka/action-lib": "3.6.1",
47-
"@lukka/assets-lib": "3.6.1",
48-
"@lukka/base-lib": "3.6.1",
49-
"@lukka/base-util-lib": "3.6.1",
50-
"@lukka/run-cmake-lib": "3.6.1",
46+
"@lukka/action-lib": "3.6.2",
47+
"@lukka/assets-lib": "3.6.2",
48+
"@lukka/base-lib": "3.6.2",
49+
"@lukka/base-util-lib": "3.6.2",
50+
"@lukka/run-cmake-lib": "3.6.2",
5151
"@types/adm-zip": "^0.4.32",
5252
"@types/follow-redirects": "^1.8.0",
5353
"@types/jest": "^26.0.14",

0 commit comments

Comments
 (0)