From 2d327b5397e69249d0d33908a3e50f6ad876a126 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Sat, 20 Nov 2021 11:02:33 -0600 Subject: [PATCH] log output - all 'ing', align --- dist/index.js | 10 +++++----- ruby-builder.js | 2 +- windows.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/index.js b/dist/index.js index e8e83928c..228d9a9cd 100644 --- a/dist/index.js +++ b/dist/index.js @@ -58195,7 +58195,7 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) { return await tc.downloadTool(url) }) - await common.measure('Extracting Ruby', async () => { + await common.measure('Extracting Ruby', async () => { if (windows) { // Windows 2016 doesn't have system tar, use MSYS2's, it needs unix style paths await exec.exec('tar', ['-xz', '-C', common.win2nix(parentDir), '-f', common.win2nix(downloadPath)]) @@ -58377,13 +58377,13 @@ async function install(platform, engine, version) { // Actions windows-2022 image does not contain any mingw or ucrt build tools. Install tools for it, // and also install ucrt tools on earlier versions, which have msys2 and mingw tools preinstalled. async function installGCCTools(type) { - const downloadPath = await common.measure(`Download ${type} build tools`, async () => { + const downloadPath = await common.measure(`Downloading ${type} build tools`, async () => { let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/${type}.7z` console.log(url) return await tc.downloadTool(url) }) - await common.measure(`Extracting ${type} build tools`, async () => + await common.measure(`Extracting ${type} build tools`, async () => // -aoa overwrite existing, -bd disable progress indicator exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', '-oC:\\msys64'], { silent: true })) } @@ -58391,13 +58391,13 @@ async function installGCCTools(type) { // Actions windows-2022 image does not contain any MSYS2 build tools. Install tools for it. // A subset of the MSYS2 base-devel group async function installMSY2Tools() { - const downloadPath = await common.measure(`Download msys2 build tools`, async () => { + const downloadPath = await common.measure(`Downloading msys2 build tools`, async () => { let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/msys2.7z` console.log(url) return await tc.downloadTool(url) }) - await common.measure(`Extracting msys2 build tools`, async () => + await common.measure(`Extracting msys2 build tools`, async () => // -aoa overwrite existing, -bd disable progress indicator exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', '-oC:\\msys64'], { silent: true })) } diff --git a/ruby-builder.js b/ruby-builder.js index e8ee9a2f6..ed8dedbe6 100644 --- a/ruby-builder.js +++ b/ruby-builder.js @@ -79,7 +79,7 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) { return await tc.downloadTool(url) }) - await common.measure('Extracting Ruby', async () => { + await common.measure('Extracting Ruby', async () => { if (windows) { // Windows 2016 doesn't have system tar, use MSYS2's, it needs unix style paths await exec.exec('tar', ['-xz', '-C', common.win2nix(parentDir), '-f', common.win2nix(downloadPath)]) diff --git a/windows.js b/windows.js index c8333bcfc..a676d6e97 100644 --- a/windows.js +++ b/windows.js @@ -77,13 +77,13 @@ export async function install(platform, engine, version) { // Actions windows-2022 image does not contain any mingw or ucrt build tools. Install tools for it, // and also install ucrt tools on earlier versions, which have msys2 and mingw tools preinstalled. async function installGCCTools(type) { - const downloadPath = await common.measure(`Download ${type} build tools`, async () => { + const downloadPath = await common.measure(`Downloading ${type} build tools`, async () => { let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/${type}.7z` console.log(url) return await tc.downloadTool(url) }) - await common.measure(`Extracting ${type} build tools`, async () => + await common.measure(`Extracting ${type} build tools`, async () => // -aoa overwrite existing, -bd disable progress indicator exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', '-oC:\\msys64'], { silent: true })) } @@ -91,13 +91,13 @@ async function installGCCTools(type) { // Actions windows-2022 image does not contain any MSYS2 build tools. Install tools for it. // A subset of the MSYS2 base-devel group async function installMSY2Tools() { - const downloadPath = await common.measure(`Download msys2 build tools`, async () => { + const downloadPath = await common.measure(`Downloading msys2 build tools`, async () => { let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/msys2.7z` console.log(url) return await tc.downloadTool(url) }) - await common.measure(`Extracting msys2 build tools`, async () => + await common.measure(`Extracting msys2 build tools`, async () => // -aoa overwrite existing, -bd disable progress indicator exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', '-oC:\\msys64'], { silent: true })) }