Skip to content

Commit

Permalink
consume run-vcpkg-lib with fix for "vcpkg's version check"
Browse files Browse the repository at this point in the history
  • Loading branch information
lukka committed Feb 23, 2021
1 parent cc7e81b commit 36477d0
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5763,7 +5763,7 @@ class VcpkgRunner {
yield this.tl.execSync('chmod', ["+x", vcpkgExePath]);
}
this.tl.info(`vcpkg executable exists at: '${vcpkgExePath}'.`);
const result = yield this.tl.execSync(vcpkgExePath, ['--version']);
const result = yield this.tl.execSync(vcpkgExePath, ['version']);
if (result.code != 0) {
needRebuild = true;
this.tl.info(`vcpkg executable returned code ${result.code}, forcing a rebuild.`);
Expand Down
2 changes: 1 addition & 1 deletion dist/post/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5775,7 +5775,7 @@ class VcpkgRunner {
yield this.tl.execSync('chmod', ["+x", vcpkgExePath]);
}
this.tl.info(`vcpkg executable exists at: '${vcpkgExePath}'.`);
const result = yield this.tl.execSync(vcpkgExePath, ['--version']);
const result = yield this.tl.execSync(vcpkgExePath, ['version']);
if (result.code != 0) {
needRebuild = true;
this.tl.info(`vcpkg executable returned code ${result.code}, forcing a rebuild.`);
Expand Down
76 changes: 38 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"@actions/exec": "^1.0.1",
"@actions/github": "^1.1.0",
"@actions/io": "^1.0.1",
"@lukka/action-lib": "1.0.15",
"@lukka/base-lib": "1.0.15",
"@lukka/base-util-lib": "1.0.15",
"@lukka/run-vcpkg-lib": "1.0.15",
"@lukka/action-lib": "1.0.16",
"@lukka/base-lib": "1.0.16",
"@lukka/base-util-lib": "1.0.16",
"@lukka/run-vcpkg-lib": "1.0.16",
"@types/adm-zip": "^0.4.32",
"@types/follow-redirects": "^1.8.0",
"@types/jest": "^24.9.0",
Expand Down

0 comments on commit 36477d0

Please sign in to comment.