actions/setup-msbuild
1
0
Fork 0
mirror of https://github.com/microsoft/setup-msbuild.git synced 2024-11-22 19:41:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use sync callback

Browse Source
This commit is contained in:
Heath Stewart 2020-04-04 12:17:00 -07:00
parent f6890ff843
commit 5cf04033c1
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dist/index.js vendored
View File

@ -1950,17 +1950,22 @@ function run() {
let foundToolPath = ''; let foundToolPath = '';
const options = {}; const options = {};
options.listeners = { options.listeners = {
stdout: (data) => __awaiter(this, void 0, void 0, function* () { stdout: (data) => {
var _b; const output = data.toString().trim();
// eslint-disable-next-line prefer-const core.debug(`Found installation path: ${output}`);
let output = data.toString(); const pattern = `${output}\\\\MSBuild\\**\\Bin\\msbuild.exe`;
const pattern = `${output.trim()}\\\\MSBuild\\**\\Bin\\msbuild.exe`; /* eslint-disable @typescript-eslint/promise-function-async */
const globber = yield glob.create(pattern); glob
const files = yield globber.glob(); .create(pattern)
if (((_b = files) === null || _b === void 0 ? void 0 : _b.length) > 0) { .then(globber => globber.glob())
foundToolPath = files[0]; .then(files => {
} var _a;
}) if (((_a = files) === null || _a === void 0 ? void 0 : _a.length) > 0) {
foundToolPath = files[0];
}
});
/* eslint-enable @typescript-eslint/promise-function-async */
}
}; };
// execute the find putting the result of the command in the options foundToolPath // execute the find putting the result of the command in the options foundToolPath
yield exec.exec(`"${vswhereToolExe}" ${VSWHERE_EXEC}`, [], options); yield exec.exec(`"${vswhereToolExe}" ${VSWHERE_EXEC}`, [], options);

2
package.json
View File

@ -11,7 +11,7 @@
"lint": "eslint src/**/*.ts", "lint": "eslint src/**/*.ts",
"pack": "ncc build", "pack": "ncc build",
"test": "jest", "test": "jest",
"all": "npm run build && npm run format && npm run lint && npm run pack && npm test" "all": "npm run build && npm run format && npm run lint && npm run pack"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

23
src/main.ts
View File

@ -59,17 +59,22 @@ async function run(): Promise<void> {
let foundToolPath = '' let foundToolPath = ''
const options: ExecOptions = {} const options: ExecOptions = {}
options.listeners = { options.listeners = {
stdout: async (data: Buffer) => { stdout: (data: Buffer) => {
// eslint-disable-next-line prefer-const const output = data.toString().trim()
let output = data.toString() core.debug(`Found installation path: ${output}`)
const pattern = `${output.trim()}\\\\MSBuild\\**\\Bin\\msbuild.exe` const pattern = `${output}\\\\MSBuild\\**\\Bin\\msbuild.exe`
const globber = await glob.create(pattern)
const files = await globber.glob()
if (files?.length > 0) { /* eslint-disable @typescript-eslint/promise-function-async */
foundToolPath = files[0] glob
} .create(pattern)
.then(globber => globber.glob())
.then(files => {
if (files?.length > 0) {
foundToolPath = files[0]
}
})
/* eslint-enable @typescript-eslint/promise-function-async */
} }
} }