Skip to content

Commit 6630836

Browse files
MSP-Gregeregon
authored andcommitted
log output - all 'ing', align
1 parent b0aab3e commit 6630836

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ruby-builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ async function downloadAndExtract(platform, engine, version, rubyPrefix) {
7979
return await tc.downloadTool(url)
8080
})
8181

82-
await common.measure('Extracting Ruby', async () => {
82+
await common.measure('Extracting Ruby', async () => {
8383
if (windows) {
8484
// Windows 2016 doesn't have system tar, use MSYS2's, it needs unix style paths
8585
await exec.exec('tar', ['-xz', '-C', common.win2nix(parentDir), '-f', common.win2nix(downloadPath)])

windows.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,27 +77,27 @@ export async function install(platform, engine, version) {
7777
// Actions windows-2022 image does not contain any mingw or ucrt build tools. Install tools for it,
7878
// and also install ucrt tools on earlier versions, which have msys2 and mingw tools preinstalled.
7979
async function installGCCTools(type) {
80-
const downloadPath = await common.measure(`Download ${type} build tools`, async () => {
80+
const downloadPath = await common.measure(`Downloading ${type} build tools`, async () => {
8181
let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/${type}.7z`
8282
console.log(url)
8383
return await tc.downloadTool(url)
8484
})
8585

86-
await common.measure(`Extracting ${type} build tools`, async () =>
86+
await common.measure(`Extracting ${type} build tools`, async () =>
8787
// -aoa overwrite existing, -bd disable progress indicator
8888
exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', '-oC:\\msys64'], { silent: true }))
8989
}
9090

9191
// Actions windows-2022 image does not contain any MSYS2 build tools. Install tools for it.
9292
// A subset of the MSYS2 base-devel group
9393
async function installMSY2Tools() {
94-
const downloadPath = await common.measure(`Download msys2 build tools`, async () => {
94+
const downloadPath = await common.measure(`Downloading msys2 build tools`, async () => {
9595
let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/msys2.7z`
9696
console.log(url)
9797
return await tc.downloadTool(url)
9898
})
9999

100-
await common.measure(`Extracting msys2 build tools`, async () =>
100+
await common.measure(`Extracting msys2 build tools`, async () =>
101101
// -aoa overwrite existing, -bd disable progress indicator
102102
exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', '-oC:\\msys64'], { silent: true }))
103103
}
@@ -110,7 +110,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
110110
return await tc.downloadTool(url)
111111
})
112112

113-
await common.measure('Extracting Ruby', async () =>
113+
await common.measure('Extracting Ruby', async () =>
114114
exec.exec('7z', ['x', downloadPath, '-bd', `-xr!${base}\\share\\doc`, `-o${parentDir}`], { silent: true }))
115115

116116
if (base !== path.basename(rubyPrefix)) {

0 commit comments

Comments
 (0)