diff --git a/lib/main.js b/lib/main.js index d11366e..e78df1e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -96,22 +96,21 @@ function run() { } } yield exec.exec(`${emsdk} activate ${emArgs.version}`); - yield exec.exec(`${emsdk} construct_env`, [], { listeners: { - stdline(message) { - const pathRegex = new RegExp(/PATH \+= (\S+)/); - const pathResult = pathRegex.exec(message); - if (pathResult) { - core.addPath(pathResult[1]); - return; - } - const envRegex = new RegExp(/(\S+) = (\S+)/); - const envResult = envRegex.exec(message); - if (envResult) { - core.exportVariable(envResult[1], envResult[2]); - return; - } - } - } }); + const envListener = (message) => { + const pathRegex = new RegExp(/PATH \+= (\S+)/); + const pathResult = pathRegex.exec(message); + if (pathResult) { + core.addPath(pathResult[1]); + return; + } + const envRegex = new RegExp(/(\S+) = (\S+)/); + const envResult = envRegex.exec(message); + if (envResult) { + core.exportVariable(envResult[1], envResult[2]); + return; + } + }; + yield exec.exec(`${emsdk} construct_env`, [], { listeners: { stdline: envListener, errline: envListener } }); if (emArgs.actionsCacheFolder && !foundInCache) { fs.mkdirSync(`${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`, { recursive: true }); yield exec.exec(`cp -r ${emsdkFolder}/emsdk-master ${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`); diff --git a/src/main.ts b/src/main.ts index acd4a36..5ea4e09 100644 --- a/src/main.ts +++ b/src/main.ts @@ -74,25 +74,24 @@ async function run() { } await exec.exec(`${emsdk} activate ${emArgs.version}`); - await exec.exec(`${emsdk} construct_env`, [], {listeners: { - stdline(message) { - const pathRegex = new RegExp(/PATH \+= (\S+)/) - const pathResult = pathRegex.exec(message); + const envListener = (message) => { + const pathRegex = new RegExp(/PATH \+= (\S+)/) + const pathResult = pathRegex.exec(message); - if (pathResult) { - core.addPath(pathResult[1]); - return; - } - - const envRegex = new RegExp(/(\S+) = (\S+)/); - const envResult = envRegex.exec(message); + if (pathResult) { + core.addPath(pathResult[1]); + return; + } + + const envRegex = new RegExp(/(\S+) = (\S+)/); + const envResult = envRegex.exec(message); - if (envResult) { - core.exportVariable(envResult[1], envResult[2]); - return; - } + if (envResult) { + core.exportVariable(envResult[1], envResult[2]); + return; } - }}) + }; + await exec.exec(`${emsdk} construct_env`, [], {listeners: {stdline: envListener, errline: envListener}}) if (emArgs.actionsCacheFolder && !foundInCache) { fs.mkdirSync(`${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`, { recursive: true });