Merge CI in a single workflow with the new include syntax

* Avoid issues when using --conservative as seen in
  https://github.com/ruby/setup-ruby/pull/48, clarifies what's getting
  installed and simplifies the following logic.
* We'll probably need changes when Bundler 3 comes out anyway.

.github/workflows/test.yml

@@ -14,16 +14,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ ubuntu, macos, windows ]
         # Use various version syntaxes here for testing
         ruby: [ 2.2, 2.3, 2.4, 2.5, 2.6.6, 2.7, ruby-head, jruby-9.1, jruby, jruby-head, truffleruby, truffleruby-head ]
+        include:
+        - { os: ubuntu, ruby: rubinius }
+        - { os: windows, ruby: mingw }
+        - { os: windows, ruby: mswin }
         exclude:
-        - os: windows-latest
-          ruby: truffleruby
-        - os: windows-latest
-          ruby: truffleruby-head
+        - { os: windows, ruby: truffleruby }
+        - { os: windows, ruby: truffleruby-head }
+
     name: ${{ matrix.os }} ${{ matrix.ruby }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}-latest
     steps:
     - uses: actions/checkout@v2
     - uses: ./
@@ -71,60 +74,6 @@ jobs:
           echo ''
         }
 
-  specials:
-    strategy:
-      fail-fast: false
-      matrix:
-        cfg:
-        - { ruby: rubinius, os: ubuntu-18.04   }
-        - { ruby: mingw   , os: windows-latest }
-        - { ruby: mswin   , os: windows-latest }
-    name: ${{ matrix.cfg.os }} ${{ matrix.cfg.ruby }}
-    runs-on: ${{ matrix.cfg.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./
-      with:
-        ruby-version: ${{ matrix.cfg.ruby }}
-    - run: ruby -v
-    - name: build compiler
-      run: |
-        ruby -e "puts 'build compiler: ' + RbConfig::CONFIG.fetch('CC_VERSION_MESSAGE', 'unknown').lines.first"
-    - name: gcc and ridk version (mingw)
-      if: startsWith(matrix.os, 'windows')
-      run: |
-        $abi, $plat = $(ruby -e "STDOUT.write RbConfig::CONFIG['ruby_version'] + ' ' + RUBY_PLATFORM").split(' ')
-        if ($plat.Contains('mingw')) {
-          gcc --version
-          if ($abi -ge '2.4') {
-            ridk version
-          } else {
-            echo 'ridk is unavailable'
-          }
-        }
-    - name: Subprocess test
-      run: ruby test_subprocess.rb
-    - name: OpenSSL version
-      run: ruby -ropenssl -e 'puts OpenSSL::OPENSSL_LIBRARY_VERSION'
-    - name: OpenSSL test
-      run: ruby -ropen-uri -e 'puts open(%{https://rubygems.org/}) { |f| f.read(1024) }'
-    - name: C extension test
-      run: gem install json:2.2.0 --no-document
-    - run: bundle --version
-    - run: bundle install
-    - run: bundle exec rake --version
-    - name: where ruby, rake
-      if: startsWith(matrix.cfg.os, 'windows')
-      run: |
-        $ErrorActionPreference = 'Continue'
-        $where = 'ruby', 'rake'
-        foreach ($e in $where) {
-          $rslt = where.exe $e 2>&1 | Out-String
-          if ($rslt.contains($e)) { echo $rslt.Trim() }
-          else { echo "Can't find $e" }
-          echo ''
-        }
-
   lint:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -163,5 +163,5 @@ Please [update](https://github.com/ruby/setup-ruby/releases/tag/v1.13.0) if you
 ## Credits
 
 The current maintainer of this action is @eregon.
-Most of the Windows logic is from https://github.com/MSP-Greg/actions-ruby by MSP-Greg.
+Most of the Windows logic is based on work by MSP-Greg.
 Many thanks to MSP-Greg and Lars Kanis for the help with Ruby Installer.

common.js

@@ -0,0 +1,40 @@
+const os = require('os')
+const fs = require('fs')
+const core = require('@actions/core')
+const { performance } = require('perf_hooks')
+
+export async function measure(name, block) {
+  return await core.group(name, async () => {
+    const start = performance.now()
+    try {
+      return await block()
+    } finally {
+      const end = performance.now()
+      const duration = (end - start) / 1000.0
+      console.log(`Took ${duration.toFixed(2).padStart(6)} seconds`)
+    }
+  })
+}
+
+export function getVirtualEnvironmentName() {
+  const platform = os.platform()
+  if (platform === 'linux') {
+    return `ubuntu-${findUbuntuVersion()}`
+  } else if (platform === 'darwin') {
+    return 'macos-latest'
+  } else if (platform === 'win32') {
+    return 'windows-latest'
+  } else {
+    throw new Error(`Unknown platform ${platform}`)
+  }
+}
+
+function findUbuntuVersion() {
+  const lsb_release = fs.readFileSync('/etc/lsb-release', 'utf8')
+  const match = lsb_release.match(/^DISTRIB_RELEASE=(\d+\.\d+)$/m)
+  if (match) {
+    return match[1]
+  } else {
+    throw new Error('Could not find Ubuntu version')
+  }
+}

dist/index.js

@@ -961,10 +961,11 @@ const fs = __webpack_require__(747)
 const path = __webpack_require__(622)
 const core = __webpack_require__(470)
 const exec = __webpack_require__(986)
+const common = __webpack_require__(239)
 
 async function run() {
   try {
-    const platform = getVirtualEnvironmentName()
+    const platform = common.getVirtualEnvironmentName()
     const [engine, version] = parseRubyEngineAndVersion(core.getInput('ruby-version'))
 
     let installer
@@ -983,7 +984,8 @@ async function run() {
 
     setupPath(ruby, newPathEntries)
 
-    await installBundler(platform, rubyPrefix, engine, version)
+    await common.measure('Installing Bundler', async () =>
+      installBundler(platform, rubyPrefix, engine, version))
 
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
@@ -1054,19 +1056,21 @@ function createGemRC() {
 }
 
 function setupPath(ruby, newPathEntries) {
-    const originalPath = process.env['PATH'].split(path.delimiter)
-    let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
+  const originalPath = process.env['PATH'].split(path.delimiter)
+  let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
-    if (cleanPath.length !== originalPath.length) {
-        console.log("Entries removed from PATH to avoid conflicts with Ruby:")
-        for (const entry of originalPath) {
-            if (!cleanPath.includes(entry)) {
-                console.log(`  ${entry}`)
-            }
-        }
+  if (cleanPath.length !== originalPath.length) {
+    core.startGroup('Cleaning PATH')
+    console.log('Entries removed from PATH to avoid conflicts with Ruby:')
+    for (const entry of originalPath) {
+      if (!cleanPath.includes(entry)) {
+        console.log(`  ${entry}`)
+      }
     }
+    core.endGroup()
+  }
 
-    core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
+  core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
 }
 
 function readBundledWithFromGemfileLock() {
@@ -1100,48 +1104,33 @@ async function installBundler(platform, rubyPrefix, engine, rubyVersion) {
     }
   }
 
-  let versionArray
+  if (bundlerVersion === 'latest') {
+    bundlerVersion = '2'
+  }
+
   if (rubyVersion.startsWith('2.2')) {
     console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby 2.2')
-    versionArray = ['-v', '~> 1']
+    bundlerVersion = '1'
   } else if (/^\d+/.test(bundlerVersion)) {
-    versionArray = ['-v', `~> ${bundlerVersion}`]
-  } else if (bundlerVersion === 'latest') {
-    versionArray = []
+    // OK
   } else {
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
   }
 
-  if (engine === 'rubinius') {
+  if (engine === 'ruby' && isHeadVersion(rubyVersion) && bundlerVersion === '2') {
+    console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
+  } else if (engine === 'truffleruby' && bundlerVersion === '1') {
+    console.log(`Using Bundler 1 shipped with ${engine}`)
+  } else if (engine === 'rubinius') {
     console.log(`Rubinius only supports the version of Bundler shipped with it`)
-  } else if (bundlerVersion === '1' && engine === 'truffleruby') {
-    console.log(`Using the Bundler version shipped with ${engine}`)
   } else {
-    await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', ...versionArray, '--no-document'])
+    const gem = path.join(rubyPrefix, 'bin', 'gem')
+    await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
   }
 }
 
-function getVirtualEnvironmentName() {
-  const platform = os.platform()
-  if (platform === 'linux') {
-    return `ubuntu-${findUbuntuVersion()}`
-  } else if (platform === 'darwin') {
-    return 'macos-latest'
-  } else if (platform === 'win32') {
-    return 'windows-latest'
-  } else {
-    throw new Error(`Unknown platform ${platform}`)
-  }
-}
-
-function findUbuntuVersion() {
-  const lsb_release = fs.readFileSync('/etc/lsb-release', 'utf8')
-  const match = lsb_release.match(/^DISTRIB_RELEASE=(\d+\.\d+)$/m)
-  if (match) {
-    return match[1]
-  } else {
-    throw new Error('Could not find Ubuntu version')
-  }
+function isHeadVersion(rubyVersion) {
+  return rubyVersion === 'head' || rubyVersion === 'mingw' || rubyVersion === 'mswin'
 }
 
 if (__filename.endsWith('index.js')) { run() }
@@ -1489,6 +1478,57 @@ function getVersions(platform) {
 
 module.exports = require("https");
 
+/***/ }),
+
+/***/ 239:
+/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "measure", function() { return measure; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getVirtualEnvironmentName", function() { return getVirtualEnvironmentName; });
+const os = __webpack_require__(87)
+const fs = __webpack_require__(747)
+const core = __webpack_require__(470)
+const { performance } = __webpack_require__(630)
+
+async function measure(name, block) {
+  return await core.group(name, async () => {
+    const start = performance.now()
+    try {
+      return await block()
+    } finally {
+      const end = performance.now()
+      const duration = (end - start) / 1000.0
+      console.log(`Took ${duration.toFixed(2).padStart(6)} seconds`)
+    }
+  })
+}
+
+function getVirtualEnvironmentName() {
+  const platform = os.platform()
+  if (platform === 'linux') {
+    return `ubuntu-${findUbuntuVersion()}`
+  } else if (platform === 'darwin') {
+    return 'macos-latest'
+  } else if (platform === 'win32') {
+    return 'windows-latest'
+  } else {
+    throw new Error(`Unknown platform ${platform}`)
+  }
+}
+
+function findUbuntuVersion() {
+  const lsb_release = fs.readFileSync('/etc/lsb-release', 'utf8')
+  const match = lsb_release.match(/^DISTRIB_RELEASE=(\d+\.\d+)$/m)
+  if (match) {
+    return match[1]
+  } else {
+    throw new Error('Could not find Ubuntu version')
+  }
+}
+
+
 /***/ }),
 
 /***/ 280:
@@ -3473,6 +3513,7 @@ const path = __webpack_require__(622)
 const exec = __webpack_require__(986)
 const io = __webpack_require__(1)
 const tc = __webpack_require__(533)
+const common = __webpack_require__(239)
 const rubyBuilderVersions = __webpack_require__(156)
 
 const builderReleaseTag = 'enable-shared'
@@ -3497,12 +3538,15 @@ async function downloadAndExtract(platform, ruby) {
   const rubiesDir = path.join(os.homedir(), '.rubies')
   await io.mkdirP(rubiesDir)
 
-  const url = await getDownloadURL(platform, ruby)
-  console.log(url)
+  const downloadPath = await common.measure('Downloading Ruby', async () => {
+    const url = getDownloadURL(platform, ruby)
+    console.log(url)
+    return await tc.downloadTool(url)
+  })
 
-  const downloadPath = await tc.downloadTool(url)
   const tar = platform.startsWith('windows') ? 'C:\\Windows\\system32\\tar.exe' : 'tar'
-  await exec.exec(tar, [ '-xz', '-C', rubiesDir, '-f',  downloadPath ])
+  await common.measure('Extracting Ruby', async () =>
+    exec.exec(tar, [ '-xz', '-C', rubiesDir, '-f',  downloadPath ]))
 
   return path.join(rubiesDir, ruby)
 }
@@ -4595,6 +4639,13 @@ module.exports = require("path");
 
 /***/ }),
 
+/***/ 630:
+/***/ (function(module) {
+
+module.exports = require("perf_hooks");
+
+/***/ }),
+
 /***/ 631:
 /***/ (function(module) {
 
@@ -4875,6 +4926,7 @@ const cp = __webpack_require__(129)
 const core = __webpack_require__(470)
 const exec = __webpack_require__(986)
 const tc = __webpack_require__(533)
+const common = __webpack_require__(239)
 const rubyInstallerVersions = __webpack_require__(471).versions
 
 // Extract to SSD, see https://github.com/ruby/setup-ruby/pull/14
@@ -4903,15 +4955,19 @@ function getAvailableVersions(platform, engine) {
 async function install(platform, ruby) {
   const version = ruby.split('-', 2)[1]
   const url = rubyInstallerVersions[version]
-  console.log(url)
 
   if (!url.endsWith('.7z')) {
-    throw new Error('URL should end in .7z')
+    throw new Error(`URL should end in .7z: ${url}`)
   }
   const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
 
-  const downloadPath = await tc.downloadTool(url)
-  await exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${drive}:\\`], { silent: true })
+  const downloadPath = await common.measure('Downloading Ruby', async () => {
+    console.log(url)
+    return await tc.downloadTool(url)
+  })
+
+  await common.measure('Extracting Ruby', async () =>
+    exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${drive}:\\`], { silent: true }))
   const rubyPrefix = `${drive}:\\${base}`
 
   let toolchainPaths = (version === 'mswin') ?
@@ -4930,7 +4986,8 @@ async function symLinkToEmbeddedMSYS2() {
   }
   const latestVersion = toolCacheVersions.slice(-1)[0]
   const hostedRuby = tc.find('Ruby', latestVersion)
-  await exec.exec(`cmd /c mklink /D ${msys2} ${hostedRuby}\\msys64`)
+  await common.measure('Linking MSYS2', async () =>
+    exec.exec(`cmd /c mklink /D ${msys2} ${hostedRuby}\\msys64`))
 }
 
 async function setupMingw(version) {
@@ -4938,7 +4995,8 @@ async function setupMingw(version) {
 
   if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', certFile)
-    await installMSYS(version)
+    await common.measure('Installing MSYS1', async () =>
+      installMSYS(version))
 
     return msysPathEntries
   } else {
@@ -4985,7 +5043,10 @@ async function setupMSWin() {
     await symLinkToEmbeddedMSYS2()
   }
 
-  return [...addVCVARSEnv(), ...msys2PathEntries]
+  const VCPathEntries = await common.measure('Setting up MSVC environment', async () =>
+    addVCVARSEnv())
+
+  return [...VCPathEntries, ...msys2PathEntries]
 }
 
 /* Sets MSVC environment for use in Actions

index.js

@@ -3,10 +3,11 @@ const fs = require('fs')
 const path = require('path')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
+const common = require('./common')
 
 export async function run() {
   try {
-    const platform = getVirtualEnvironmentName()
+    const platform = common.getVirtualEnvironmentName()
     const [engine, version] = parseRubyEngineAndVersion(core.getInput('ruby-version'))
 
     let installer
@@ -25,7 +26,8 @@ export async function run() {
 
     setupPath(ruby, newPathEntries)
 
-    await installBundler(platform, rubyPrefix, engine, version)
+    await common.measure('Installing Bundler', async () =>
+      installBundler(platform, rubyPrefix, engine, version))
 
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
@@ -96,19 +98,21 @@ function createGemRC() {
 }
 
 function setupPath(ruby, newPathEntries) {
-    const originalPath = process.env['PATH'].split(path.delimiter)
-    let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
+  const originalPath = process.env['PATH'].split(path.delimiter)
+  let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
-    if (cleanPath.length !== originalPath.length) {
-        console.log("Entries removed from PATH to avoid conflicts with Ruby:")
-        for (const entry of originalPath) {
-            if (!cleanPath.includes(entry)) {
-                console.log(`  ${entry}`)
-            }
-        }
+  if (cleanPath.length !== originalPath.length) {
+    core.startGroup('Cleaning PATH')
+    console.log('Entries removed from PATH to avoid conflicts with Ruby:')
+    for (const entry of originalPath) {
+      if (!cleanPath.includes(entry)) {
+        console.log(`  ${entry}`)
+      }
     }
+    core.endGroup()
+  }
 
-    core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
+  core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
 }
 
 function readBundledWithFromGemfileLock() {
@@ -142,48 +146,33 @@ async function installBundler(platform, rubyPrefix, engine, rubyVersion) {
     }
   }
 
-  let versionArray
+  if (bundlerVersion === 'latest') {
+    bundlerVersion = '2'
+  }
+
   if (rubyVersion.startsWith('2.2')) {
     console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby 2.2')
-    versionArray = ['-v', '~> 1']
+    bundlerVersion = '1'
   } else if (/^\d+/.test(bundlerVersion)) {
-    versionArray = ['-v', `~> ${bundlerVersion}`]
-  } else if (bundlerVersion === 'latest') {
-    versionArray = []
+    // OK
   } else {
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
   }
 
-  if (engine === 'rubinius') {
+  if (engine === 'ruby' && isHeadVersion(rubyVersion) && bundlerVersion === '2') {
+    console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
+  } else if (engine === 'truffleruby' && bundlerVersion === '1') {
+    console.log(`Using Bundler 1 shipped with ${engine}`)
+  } else if (engine === 'rubinius') {
     console.log(`Rubinius only supports the version of Bundler shipped with it`)
-  } else if (bundlerVersion === '1' && engine === 'truffleruby') {
-    console.log(`Using the Bundler version shipped with ${engine}`)
   } else {
-    await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', ...versionArray, '--no-document'])
+    const gem = path.join(rubyPrefix, 'bin', 'gem')
+    await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
   }
 }
 
-function getVirtualEnvironmentName() {
-  const platform = os.platform()
-  if (platform === 'linux') {
-    return `ubuntu-${findUbuntuVersion()}`
-  } else if (platform === 'darwin') {
-    return 'macos-latest'
-  } else if (platform === 'win32') {
-    return 'windows-latest'
-  } else {
-    throw new Error(`Unknown platform ${platform}`)
-  }
-}
-
-function findUbuntuVersion() {
-  const lsb_release = fs.readFileSync('/etc/lsb-release', 'utf8')
-  const match = lsb_release.match(/^DISTRIB_RELEASE=(\d+\.\d+)$/m)
-  if (match) {
-    return match[1]
-  } else {
-    throw new Error('Could not find Ubuntu version')
-  }
+function isHeadVersion(rubyVersion) {
+  return rubyVersion === 'head' || rubyVersion === 'mingw' || rubyVersion === 'mswin'
 }
 
 if (__filename.endsWith('index.js')) { run() }

ruby-builder.js

@@ -3,6 +3,7 @@ const path = require('path')
 const exec = require('@actions/exec')
 const io = require('@actions/io')
 const tc = require('@actions/tool-cache')
+const common = require('./common')
 const rubyBuilderVersions = require('./ruby-builder-versions')
 
 const builderReleaseTag = 'enable-shared'
@@ -27,12 +28,15 @@ async function downloadAndExtract(platform, ruby) {
   const rubiesDir = path.join(os.homedir(), '.rubies')
   await io.mkdirP(rubiesDir)
 
-  const url = await getDownloadURL(platform, ruby)
-  console.log(url)
+  const downloadPath = await common.measure('Downloading Ruby', async () => {
+    const url = getDownloadURL(platform, ruby)
+    console.log(url)
+    return await tc.downloadTool(url)
+  })
 
-  const downloadPath = await tc.downloadTool(url)
   const tar = platform.startsWith('windows') ? 'C:\\Windows\\system32\\tar.exe' : 'tar'
-  await exec.exec(tar, [ '-xz', '-C', rubiesDir, '-f',  downloadPath ])
+  await common.measure('Extracting Ruby', async () =>
+    exec.exec(tar, [ '-xz', '-C', rubiesDir, '-f',  downloadPath ]))
 
   return path.join(rubiesDir, ruby)
 }

windows.js

@@ -7,6 +7,7 @@ const cp = require('child_process')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
 const tc = require('@actions/tool-cache')
+const common = require('./common')
 const rubyInstallerVersions = require('./windows-versions').versions
 
 // Extract to SSD, see https://github.com/ruby/setup-ruby/pull/14
@@ -35,15 +36,19 @@ export function getAvailableVersions(platform, engine) {
 export async function install(platform, ruby) {
   const version = ruby.split('-', 2)[1]
   const url = rubyInstallerVersions[version]
-  console.log(url)
 
   if (!url.endsWith('.7z')) {
-    throw new Error('URL should end in .7z')
+    throw new Error(`URL should end in .7z: ${url}`)
   }
   const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
 
-  const downloadPath = await tc.downloadTool(url)
-  await exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${drive}:\\`], { silent: true })
+  const downloadPath = await common.measure('Downloading Ruby', async () => {
+    console.log(url)
+    return await tc.downloadTool(url)
+  })
+
+  await common.measure('Extracting Ruby', async () =>
+    exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${drive}:\\`], { silent: true }))
   const rubyPrefix = `${drive}:\\${base}`
 
   let toolchainPaths = (version === 'mswin') ?
@@ -62,7 +67,8 @@ async function symLinkToEmbeddedMSYS2() {
   }
   const latestVersion = toolCacheVersions.slice(-1)[0]
   const hostedRuby = tc.find('Ruby', latestVersion)
-  await exec.exec(`cmd /c mklink /D ${msys2} ${hostedRuby}\\msys64`)
+  await common.measure('Linking MSYS2', async () =>
+    exec.exec(`cmd /c mklink /D ${msys2} ${hostedRuby}\\msys64`))
 }
 
 async function setupMingw(version) {
@@ -70,7 +76,8 @@ async function setupMingw(version) {
 
   if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', certFile)
-    await installMSYS(version)
+    await common.measure('Installing MSYS1', async () =>
+      installMSYS(version))
 
     return msysPathEntries
   } else {
@@ -117,7 +124,10 @@ async function setupMSWin() {
     await symLinkToEmbeddedMSYS2()
   }
 
-  return [...addVCVARSEnv(), ...msys2PathEntries]
+  const VCPathEntries = await common.measure('Setting up MSVC environment', async () =>
+    addVCVARSEnv())
+
+  return [...VCPathEntries, ...msys2PathEntries]
 }
 
 /* Sets MSVC environment for use in Actions