Test 3.3 preview

* https://github.com/ruby/setup-ruby/issues/496#issuecomment-1520667671

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [eregon]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,21 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-Before filing this issue:
-* Make sure you use the latest version with `- uses: ruby/setup-ruby@v1` (see https://github.com/ruby/setup-ruby/blob/master/README.md#versioning)
-* If the issue happens on JRuby or TruffleRuby, and does not happen on CRuby (please check), file an issue there instead. It's very unlikely ruby/setup-ruby is the cause.
-* Try to reproduce the issue locally by following the workflow steps (including all commands done by ruby/setup-ruby, except for `Downloading Ruby` & `Extracting Ruby`). If it does reproduce locally, it's not a ruby/setup-ruby issue.
-
-Please provide:
-* the code of or a link to the workflow used
-* the link to the log of a failed workflow job
-* the command and output of the step failing
-* whether you are using a self-hosted runner
--->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,43 @@
+name: Bug report
+description: Create a report to help us improve
+body:
+- type: markdown
+  attributes:
+    value: |
+      First, take some time to think whether this is really an issue of ruby/setup-ruby and whether it is fixable in this action.
+      This action basically just downloads a prebuilt Ruby and adds it to `PATH`, so it is unlikely the bug is in this action.
+      Give some thoughts whether it could be an issue in your workflow, in the gems you use, in GitHub Actions, in Ruby, RubyGems, Bundler, etc.
+      This is NOT the place to ask help about your workflow failing (ask that on [GitHub Community](https://github.com/orgs/community/discussions/categories/actions) or [Discussions](https://github.com/ruby/setup-ruby/discussions) instead), it is only to report issues about ruby/setup-ruby.
+      Please note we will close your issue without comment if you do not fill out the requested information.
+- type: checkboxes
+  attributes:
+    label: Ensure the following before filing this issue
+    options:
+    - label: |
+        I verified it reproduces with the latest version with `- uses: ruby/setup-ruby@v1` (see [Versioning policy](https://github.com/ruby/setup-ruby/blob/master/README.md#versioning))
+      required: true
+    - label: |
+        I tried to reproduce the issue locally by following the workflow steps (including all commands done by `ruby/setup-ruby`, except for `Downloading Ruby` & `Extracting Ruby`),
+        and it did not reproduce locally (if it does reproduce locally, it's not a ruby/setup-ruby issue)
+      required: true
+    # - label: |
+    #     If the issue happens on JRuby or TruffleRuby, and does not happen on CRuby (please check), file an issue there instead. It's very unlikely ruby/setup-ruby is the cause.
+    #   required: true
+- type: dropdown
+  attributes:
+    label: Are you running on a GitHub-hosted runner or a self-hosted runner?
+    options:
+      - GitHub-hosted runner
+      - self-hosted runner
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Link to the failed workflow job (must be a public workflow job, so the necessary information is available)
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Any other notes?
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/other-issue--not-a-bug-.md

@@ -0,0 +1,10 @@
+---
+name: Other issue (not a bug)
+about: Feature requests, etc
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/workflows/release.yml

@@ -2,11 +2,16 @@ name: Update the v1 branch when a release is published
 on:
   release:
     types: [published]
+permissions:
+  contents: read
+
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write # for git push
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - run: git push origin HEAD:v1

.github/workflows/test.yml

@@ -9,19 +9,22 @@ on:
     paths-ignore:
     - README.md
   workflow_dispatch:
+permissions:
+  contents: read
 
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11, macos-12, windows-2019, windows-2022 ]
+        os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13, windows-2019, windows-2022 ]
-        ruby: [ '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', ruby-head, jruby, jruby-head, truffleruby, truffleruby-head, truffleruby+graalvm, truffleruby+graalvm-head ]
+        ruby: [
+          '1.9', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', ruby-head,
+          jruby, jruby-head,
+          truffleruby, truffleruby-head,
+          truffleruby+graalvm, truffleruby+graalvm-head
+        ]
         include:
-        - { os: ubuntu-22.04, ruby: '3.1.0' }
-        - { os: ubuntu-22.04, ruby: '3.1' }
-        - { os: ubuntu-22.04, ruby: '3.2.0-preview1' }
-        - { os: ubuntu-22.04, ruby: ruby-head }
         - { os: windows-2019, ruby: mingw }
         - { os: windows-2019, ruby: mswin }
         - { os: windows-2022, ruby: mingw }
@@ -29,12 +32,14 @@ jobs:
         - { os: windows-2022, ruby: ucrt  }
         exclude:
         - { os: windows-2019, ruby: '1.9' }
+        - { os: windows-2019, ruby: '3.3' }
         - { os: windows-2019, ruby: debug }
         - { os: windows-2019, ruby: truffleruby }
         - { os: windows-2019, ruby: truffleruby-head }
         - { os: windows-2019, ruby: truffleruby+graalvm }
         - { os: windows-2019, ruby: truffleruby+graalvm-head }
         - { os: windows-2022, ruby: '1.9' }
+        - { os: windows-2022, ruby: '3.3' }
         - { os: windows-2022, ruby: debug }
         - { os: windows-2022, ruby: truffleruby }
         - { os: windows-2022, ruby: truffleruby-head }
@@ -44,7 +49,7 @@ jobs:
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - uses: ./
       with:
@@ -71,6 +76,8 @@ jobs:
           } else {
             echo 'ridk is unavailable'
           }
+        } elseif ($plat.Contains('mswin')) {
+          &"$env:VCPKG_INSTALLATION_ROOT\vcpkg" list
         }
     - name: RbConfig::CONFIG
       run: ruby -rrbconfig -rpp -e 'pp RbConfig::CONFIG'
@@ -96,14 +103,36 @@ jobs:
     - run: bundle exec rake --version
     - run: bundle exec rake
 
-    - name: which ruby, rake
+    # Ensure the same bundle commands work in bash on Windows
+    - name: bundle install (bash)
+      run: bundle install
+      shell: bash
+      if: startsWith(matrix.os, 'windows')
+    - name: bundle exec rake --version (bash)
+      run: bundle exec rake --version
+      shell: bash
+      if: startsWith(matrix.os, 'windows')
+    - name: bundle exec rake (bash)
+      run: bundle exec rake
+      shell: bash
+      if: startsWith(matrix.os, 'windows')
+
+    - name: Test `gem github:` in a Gemfile
+      run: bundle install
+      env:
+        BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/gem_from_github.gemfile
+
+    - name: which ruby, bundle
+      shell: bash
+      run: which -a ruby bundle
+    - name: which rake
+      run: which -a rake
       if: "!startsWith(matrix.os, 'windows')"
-      run: which -a ruby rake
+    - name: where ruby, rake, bundle
-    - name: where ruby, rake
       if: startsWith(matrix.os, 'windows')
       run: |
         $ErrorActionPreference = 'Continue'
-        $where = 'ruby', 'rake'
+        $where = 'ruby', 'rake', 'bundle'
         foreach ($e in $where) {
           $rslt = where.exe $e 2>&1 | Out-String
           if ($rslt.contains($e)) { echo $rslt.Trim() }
@@ -112,16 +141,27 @@ jobs:
         }
     - name: bash test
       shell: bash
-      run: echo ~
+      run: echo ~ && bundle install
     - name: Windows JRuby
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.ruby, 'jruby')
       run: gem install sassc
 
+  testNoGemfile:
+    name: "Test with no Gemfile"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: rm Gemfile
+      - uses: ./
+        with:
+          ruby-version: '2.6'
+      - run: ruby -v
+
   testLatestRubygemsVersion:
     name: "Test rubygems: latest upgrades the default RubyGems version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -132,7 +172,7 @@ jobs:
     name: "Test rubygems: version upgrades RubyGems to that version if the default is older"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -143,7 +183,7 @@ jobs:
     name: "Test rubygems: version noops if the default is newer"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./
       with:
         ruby-version: '3.1.0'
@@ -154,19 +194,19 @@ jobs:
     name: "Test rubygems: version uses the Bundler installed by the rubygems update"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ./
         with:
-          ruby-version: '2.2'
+          ruby-version: '3.1.0'
-          rubygems: 2.7.11
+          rubygems: 3.4.0
-      - run: gem --version | grep -F "2.7.11"
+      - run: gem --version | grep -F "3.4.0"
-      - run: bundle --version | grep -F "1.16.6"
+      - run: bundle --version | grep -F "2.4.0"
 
   testFixedBundlerVersionForOldRuby:
     name: "Test bundler: 1.x for old Ruby"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ./
         with:
           ruby-version: '2.2'
@@ -177,7 +217,7 @@ jobs:
     name: "Test with a major Bundler version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -188,7 +228,7 @@ jobs:
     name: "Test with a minor Bundler version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./
       with:
         ruby-version: '2.6'
@@ -199,20 +239,43 @@ jobs:
     name: "Test with an exact Bundler version"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ./
       with:
         ruby-version: '2.6'
         bundler: 2.2.3
     - run: bundle --version | grep -F "Bundler version 2.2.3"
 
+  testBundlerPre:
+    name: "Test with a Bundler pre/rc version"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./
+        with:
+          ruby-version: '2.6'
+          bundler: 2.2.0.rc.2
+      - run: bundle --version | grep -F "Bundler version 2.2.0.rc.2"
+
+  testBundlerDev:
+    name: "Test BUNDLED WITH Bundler dev"
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler-dev.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./
+        with:
+          ruby-version: ruby-head
+          bundler-cache: true
+
   testDependencyOnBundler1:
     name: "Test gemfile depending on Bundler 1"
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/bundler1.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ./
         with:
           ruby-version: '2.7'
@@ -230,7 +293,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ./
         with:
           ruby-version: '2.6'
@@ -243,7 +306,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/nokogiri.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ./
         with:
           ruby-version: truffleruby-head
@@ -253,7 +316,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: yarn install
     - run: yarn run package
     - name: Check generated files are up to date

README.md

@@ -5,8 +5,9 @@ This action downloads a prebuilt ruby and adds it to the `PATH`.
 It is very efficient and takes about 5 seconds to download, extract and add the given Ruby to the `PATH`.
 No extra packages need to be installed.
 
-Compared to [actions/setup-ruby](https://github.com/actions/setup-ruby),
+**Important:** Prefer `ruby/setup-ruby@v1`.
-this actions supports many more versions and features.
+If you pin to a commit or release, only the Ruby versions available at the time of the commit
+will be available, and you will need to update it to use newer Ruby versions, see [Versioning](#versioning).
 
 ### Supported Versions
 
@@ -14,40 +15,40 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.2.0-preview1, head, debug, mingw, mswin |
+| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.3.0-preview1, head, debug, mingw, mswin, ucrt |
-| `jruby` | 9.1.17.0 - 9.3.4.0, head |
+| `jruby` | 9.1.17.0 - 9.4.2.0, head |
-| `truffleruby` | 19.3.0 - 22.1.0, head |
+| `truffleruby` | 19.3.0 - 23.0.0-preview1, head |
-| `truffleruby+graalvm` | 21.2.0 - 22.1.0, head |
+| `truffleruby+graalvm` | 21.2.0 - 23.0.0-preview1, head |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).  
-On Windows, `mingw` and `mswin` are `ruby-head` builds using the MSYS2/MinGW and the MSVC toolchains respectively.
+
+Regarding Windows ruby master builds, `mingw` is a MSYS2/MinGW build, `head` & `ucrt` are MSYS2/UCRT64
+builds, and `mswin` is a MSVC/VS 2022 build.
 
 Preview and RC versions of Ruby might be available too on Ubuntu and macOS (not on Windows).
 However, it is recommended to test against `ruby-head` rather than previews,
 as it provides more useful feedback for the Ruby core team and for upcoming changes.
 
-Only versions published by [RubyInstaller](https://rubyinstaller.org/downloads/archives/) are available on Windows.
+Only release versions published by [RubyInstaller](https://rubyinstaller.org/downloads/archives/)
-Due to that, Ruby 2.2 resolves to 2.2.6 on Windows and 2.2.10 on other platforms.
+are available on Windows.  Due to that, Ruby 2.2 resolves to 2.2.6 on Windows and 2.2.10
-And Ruby 2.3 on Windows only has builds for 2.3.0, 2.3.1 and 2.3.3.
+on other platforms. Ruby 2.3 on Windows only has builds for 2.3.0, 2.3.1 and 2.3.3.
 
 Note that Ruby ≤ 2.4 and the OpenSSL version it needs (1.0.2) are both end-of-life,
 which means Ruby ≤ 2.4 is unmaintained and considered insecure.
 
 ### Supported Platforms
 
-The action works on these [GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners) virtual environments. Virtual environments not listed below are unsupported.
+The action works on these [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) images. Runner images not listed below are not supported yet. `$OS-latest` just alias to one of these images.
 
-| Operating System | Recommended | Other Supported Versions |
+| Operating System | Supported |
-| ----------- | -------- | -------- |
+| ---------------- | --------- |
-| Ubuntu  | `ubuntu-latest`  (= `ubuntu-20.04`) | `ubuntu-18.04`, `ubuntu-22.04` (beta, only `ruby: 3.1 - head`) |
+| Ubuntu  | `ubuntu-20.04`, `ubuntu-22.04` |
-| macOS   | `macos-latest`   (= `macos-11`)  | `macos-10.15`, `macos-12` (beta) |
+| macOS   | `macos-11`, `macos-12`, `macos-13` |
-| Windows | `windows-latest` (= `windows-2022`) | `windows-2019` |
+| Windows | `windows-2019`, `windows-2022` |
-
-On `ubuntu-22.04` (beta), only `ruby: 3.1 - head` are supported, due to Ubuntu 22.04 only supporting OpenSSL 3.
 
 The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
 and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
-`mingw` and `mswin` builds are generated by [ruby-loco](https://github.com/MSP-Greg/ruby-loco).
+The `mingw`, `ucrt` and `mswin` builds are generated by [ruby-loco](https://github.com/MSP-Greg/ruby-loco).
 `ruby-head` is generated by [ruby-dev-builder](https://github.com/ruby/ruby-dev-builder),
 `jruby-head` is generated by [jruby-dev-builder](https://github.com/ruby/jruby-dev-builder),
 `truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder)
@@ -66,7 +67,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3.0' # Not needed with a .ruby-version file
@@ -91,7 +92,7 @@ jobs:
         ruby: ['2.7', '3.0', '3.1', head, jruby, jruby-head, truffleruby, truffleruby-head]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -114,7 +115,7 @@ jobs:
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
@@ -131,7 +132,7 @@ and the [condition and expression syntax](https://help.github.com/en/actions/ref
 * engine-version like `ruby-2.6.5` and `truffleruby-19.3.0`
 * short version like `'2.6'`, automatically using the latest release matching that version (`2.6.10`)
 * version only like `'2.6.5'`, assumes MRI for the engine
-* engine only like `truffleruby`, uses the latest stable release of that implementation
+* engine only like `ruby` and `truffleruby`, uses the latest stable release of that implementation
 * `.ruby-version` reads from the project's `.ruby-version` file
 * `.tool-versions` reads from the project's `.tool-versions` file
 * If the `ruby-version` input is not specified, `.ruby-version` is tried first, followed by `.tool-versions`
@@ -155,9 +156,12 @@ should be able to fix them by setting `rubygems: 3.0.0` or higher.
 
 ### Bundler
 
-By default, if there is a `Gemfile.lock` file (or `$BUNDLE_GEMFILE.lock` or `gems.locked`) with a `BUNDLED WITH` section,
+By default, Bundler is installed as follows:
-that version of Bundler will be installed and used.
+
-Otherwise, the latest compatible Bundler version is installed (Bundler 2 on Ruby >= 2.4, Bundler 1 on Ruby < 2.4).
+* If there is a `Gemfile.lock` file (or `$BUNDLE_GEMFILE.lock` or `gems.locked`) with a `BUNDLED WITH` section,
+  that version of Bundler will be installed and used.
+* If the Ruby ships with Bundler 2.2+ (as a default gem), that version is used.
+* Otherwise, the latest compatible Bundler version is installed (Bundler 2 on Ruby >= 2.3, Bundler 1 on Ruby < 2.3).
 
 This behavior can be customized, see [action.yml](action.yml) for more details about the `bundler` input.
 
@@ -228,6 +232,7 @@ It is recommended to first get your build working on Ubuntu and macOS before try
 * For Ruby ≥ 2.4, MSYS2 is prepended to the `Path`, similar to what RubyInstaller2 does.
 * For Ruby < 2.4, the DevKit MSYS tools are installed and prepended to the `Path`.
 * Use JRuby 9.2.20+ on Windows (older versions have [bugs](https://github.com/ruby/setup-ruby/issues/18#issuecomment-889072695)).
+* JRuby on Windows has multiple issues ([jruby/jruby#7106](https://github.com/jruby/jruby/issues/7106), [jruby/jruby#7182](https://github.com/jruby/jruby/issues/7182)).
 
 ## Versioning
 
@@ -244,10 +249,9 @@ This follows the [recommendations](https://github.com/actions/toolkit/blob/maste
 ## Using self-hosted runners
 
 This action might work with [self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners)
-if the [virtual environment](https://github.com/actions/virtual-environments) is very similar to the ones used by GitHub runners. Notably:
+if the [Runner Image](https://github.com/actions/runner-images) is very similar to the ones used by GitHub runners. Notably:
 
 * Make sure to use the same operating system and version.
-* Set the environment variable `ImageOS` on the runner to the corresponding value on GitHub-hosted runners (e.g. `ubuntu18`/`macos1015`/`win19`). This is necessary to detect the operating system and version.
 * Make sure to use the same version of libssl.
 * Make sure that the operating system has `libyaml-0` and [`libgmp`](https://stackoverflow.com/questions/26555902/ruby-v-dyld-library-not-loaded-usr-local-lib-libgmp-10-dylib) installed
 * The default tool cache directory (`/opt/hostedtoolcache` on Linux, `/Users/runner/hostedtoolcache` on macOS,
@@ -255,9 +259,9 @@ if the [virtual environment](https://github.com/actions/virtual-environments) is
   This is necessary since the Ruby builds embed the install path when built and cannot be moved around.
 * `/home/runner` must be writable by the `runner` user.
 
-In other cases, please use a system Ruby or [install Ruby manually](https://github.com/postmodern/chruby/wiki#installing-rubies) instead.
+In other cases, you will need to install Ruby in the runner tool cache as shown by the action when it detects that case
-
+(run it so it will show you where to install Ruby).
-On a self-hosted runner you need to define the `ImageOs` as an evironment variable on the host, you can do this in the `~/actions-runner/.env` file (See [#230](https://github.com/ruby/setup-ruby/issues/230)).
+You could of course also not use this action and e.g. use Ruby from a system package or use a Docker image instead.
 
 ## History
 

action.yml

@@ -16,9 +16,11 @@ inputs:
       Similarly, if a version number is given, `gem update --system <version>` is run to update to that version of RubyGems, as long as that version is newer than the one provided by default.
   bundler:
     description: |
-      The version of Bundler to install. Either 'none', 'latest', 'Gemfile.lock', or a version number (e.g., 1, 2, 2.1, 2.1.4).
+      The version of Bundler to install. Either 'Gemfile.lock' (the default), 'default', 'latest', 'none', or a version number (e.g., 1, 2, 2.1, 2.1.4).
-      For 'Gemfile.lock', the version is determined based on the BUNDLED WITH section from the file Gemfile.lock, $BUNDLE_GEMFILE.lock or gems.locked.
+      For 'Gemfile.lock', the version of the BUNDLED WITH section from the Gemfile.lock if it exists. If the file or section does not exist then the same as 'default'.
-      Defaults to 'default', which means 'Gemfile.lock' if the file exists and 'latest' otherwise.
+      For 'default', if the Ruby ships with Bundler 2.2+ as a default gem, that version is used, otherwise the same as 'latest'.
+      For 'latest', the latest compatible Bundler version is installed (Bundler 2 on Ruby >= 2.3, Bundler 1 on Ruby < 2.3).
+      For 'none', nothing is done.
   bundler-cache:
     description: 'Run "bundle install", and cache the result automatically. Either true or false.'
     default: 'false'
@@ -28,6 +30,11 @@ inputs:
     description: |
       Arbitrary string that will be added to the cache key of the bundler cache. Set or change it if you need
       to invalidate the cache.
+  self-hosted:
+    description: |
+      Consider the runner as a self-hosted runner, which means not using prebuilt Ruby binaries which only work
+      on GitHub-hosted runners or self-hosted runners with a very similar image to the ones used by GitHub runners.
+      The default is to detect this automatically based on the OS, OS version and $RUNNER_TOOL_CACHE.
 outputs:
   ruby-prefix:
     description: 'The prefix of the installed ruby'

bundler.js

@@ -7,6 +7,10 @@ const common = require('./common')
 
 export const DEFAULT_CACHE_VERSION = '0'
 
+function isValidBundlerVersion(bundlerVersion) {
+  return /^\d+(?:\.\d+){0,2}/.test(bundlerVersion) && !bundlerVersion.endsWith('.dev')
+}
+
 // The returned gemfile is guaranteed to exist, the lockfile might not exist
 export function detectGemfiles() {
   const gemfilePath = process.env['BUNDLE_GEMFILE'] || 'Gemfile'
@@ -30,10 +34,14 @@ function readBundledWithFromGemfileLock(lockFile) {
     const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
     if (bundledWithLine !== -1) {
       const nextLine = lines[bundledWithLine+1]
-      if (nextLine && /^\d+/.test(nextLine.trim())) {
+      if (nextLine) {
         const bundlerVersion = nextLine.trim()
-        console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
+        if (isValidBundlerVersion(bundlerVersion)) {
-        return bundlerVersion
+          console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
+          return bundlerVersion
+        } else {
+          console.log(`Could not parse BUNDLED WITH version as a valid Bundler release, ignoring it: ${bundlerVersion}`)
+        }
       }
     }
   }
@@ -53,15 +61,40 @@ async function afterLockFile(lockFile, platform, engine, rubyVersion) {
 export async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, platform, rubyPrefix, engine, rubyVersion) {
   let bundlerVersion = bundlerVersionInput
 
-  if (rubygemsInputSet && bundlerVersion === 'default') {
+  if (rubygemsInputSet && (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock')) {
     console.log('Using the Bundler installed by updating RubyGems')
     return 'unknown'
   }
 
-  if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
+  if (bundlerVersion === 'Gemfile.lock') {
-    bundlerVersion = readBundledWithFromGemfileLock(lockFile)
+    let bundlerVersionFromGemfileLock = readBundledWithFromGemfileLock(lockFile)
 
-    if (!bundlerVersion) {
+    if (bundlerVersionFromGemfileLock) {
+      bundlerVersion = bundlerVersionFromGemfileLock
+    } else {
+      bundlerVersion = 'default'
+    }
+  }
+
+  const floatVersion = common.floatVersion(rubyVersion)
+
+  if (bundlerVersion === 'default') {
+    if (common.isBundler2dot2Default(engine, rubyVersion)) {
+      if (common.windows && engine === 'ruby' && (common.isStableVersion(engine, rubyVersion) || rubyVersion === 'head')) {
+        // https://github.com/ruby/setup-ruby/issues/371
+        console.log(`Installing latest Bundler for ${engine}-${rubyVersion} on Windows because bin/bundle does not work in bash otherwise`)
+        bundlerVersion = 'latest'
+      } else {
+        console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
+        return '2'
+      }
+    } else if (common.hasBundlerDefaultGem(engine, rubyVersion)) {
+      // Those Rubies have a old Bundler default gem < 2.2 which does not work well for `gem 'foo', github: 'foo/foo'`:
+      // https://github.com/ruby/setup-ruby/issues/358#issuecomment-1195899304
+      // Also, Ruby 2.6 would get Bundler 1 yet Ruby 2.3 - 2.5 get latest Bundler 2 which might be unexpected.
+      console.log(`Using latest Bundler for ${engine}-${rubyVersion} because the default Bundler gem is too old for that Ruby version`)
+      bundlerVersion = 'latest'
+    } else {
       bundlerVersion = 'latest'
     }
   }
@@ -70,14 +103,12 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     bundlerVersion = '2'
   }
 
-  if (/^\d+(?:\.\d+){0,2}$/.test(bundlerVersion)) {
+  if (isValidBundlerVersion(bundlerVersion)) {
     // OK - input is a 1, 2, or 3 part version number
   } else {
     throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
   }
 
-  const floatVersion = common.floatVersion(rubyVersion)
-
   // Use Bundler 1 when we know Bundler 2 does not work
   if (bundlerVersion.startsWith('2')) {
     if (engine === 'ruby' && floatVersion <= 2.2) {
@@ -92,31 +123,29 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
     }
   }
 
-  // Workaround for truffleruby 22.0 + latest Bundler, use shipped Bundler instead: https://github.com/oracle/truffleruby/issues/2586
+  const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
-  const truffleruby22workaround = engine.startsWith('truffleruby') && rubyVersion.startsWith('22.0')
+  // Use Bundler 2.3 when we use Ruby 2.3.2 - 2.5
-  const useShippedBundler2 = common.isHeadVersion(rubyVersion) || truffleruby22workaround
+  // Use Bundler 2.4 when we use Ruby 2.6-2.7
-
+  if (bundlerVersion == '2') {
-  if (useShippedBundler2 && common.isBundler2Default(engine, rubyVersion) && bundlerVersion.startsWith('2')) {
+    if (targetRubyVersion <= 2.5) { // < 2.3.2 already handled above
-    // Avoid installing a newer Bundler version for head versions as it might not work.
+      console.log('Ruby 2.3.2 - 2.5 only works with Bundler 2.3')
-    // For releases, even if they ship with Bundler 2 we install the latest Bundler.
+      bundlerVersion = '2.3'
-    if (truffleruby22workaround) {
+    } else if (targetRubyVersion <= 2.7) {
-      console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion} (workaround for https://github.com/oracle/truffleruby/issues/2586 on truffleruby 22.0)`)
+      console.log('Ruby 2.6-2.7 only works with Bundler 2.4')
-    } else {
+      bundlerVersion = '2.4'
-      console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion} (head versions do not always support the latest Bundler release)`)
     }
-  } else if (engine.startsWith('truffleruby') && common.isBundler1Default(engine, rubyVersion) && bundlerVersion.startsWith('1')) {
-    console.log(`Using Bundler 1 shipped with ${engine}-${rubyVersion} (required for truffleruby < 21.0)`)
-  } else {
-    const gem = path.join(rubyPrefix, 'bin', 'gem')
-    // Workaround for https://github.com/rubygems/rubygems/issues/5245
-    const force = (platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) ? ['--force'] : []
-
-    const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
-    const bundlerVersionConstraint = versionParts === 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
-
-    await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
   }
 
+  const gem = path.join(rubyPrefix, 'bin', 'gem')
+  // Workaround for https://github.com/rubygems/rubygems/issues/5245
+  // and for https://github.com/oracle/truffleruby/issues/2780
+  const force = ((platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) || (engine === 'truffleruby')) ? ['--force'] : []
+
+  const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
+  const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
+
+  await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
+
   return bundlerVersion
 }
 
@@ -203,8 +232,14 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
 }
 
 async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) {
-  const cacheVersionSuffix = DEFAULT_CACHE_VERSION === cacheVersion ? '' : `-cachever:${cacheVersion}`
+  const cwd = process.cwd()
-  let key = `setup-ruby-bundler-cache-v3-${platform}-${engine}-${version}${cacheVersionSuffix}`
+  const bundleWith = process.env['BUNDLE_WITH'] || ''
+  const bundleWithout = process.env['BUNDLE_WITHOUT'] || ''
+  let key = `setup-ruby-bundler-cache-v5-${common.getOSNameVersionArch()}-${engine}-${version}-wd-${cwd}-with-${bundleWith}-without-${bundleWithout}`
+
+  if (cacheVersion !== DEFAULT_CACHE_VERSION) {
+    key += `-v-${cacheVersion}`
+  }
 
   if (common.isHeadVersion(version)) {
     if (engine !== 'jruby') {

common.js

@@ -5,12 +5,19 @@ const util = require('util')
 const stream = require('stream')
 const crypto = require('crypto')
 const core = require('@actions/core')
+const tc = require('@actions/tool-cache')
 const { performance } = require('perf_hooks')
+const linuxOSInfo = require('linux-os-info')
+import macosRelease from 'macos-release'
 
 export const windows = (os.platform() === 'win32')
 // Extract to SSD on Windows, see https://github.com/ruby/setup-ruby/pull/14
 export const drive = (windows ? (process.env['GITHUB_WORKSPACE'] || 'C')[0] : undefined)
 
+export const inputs = {
+  selfHosted: undefined
+}
+
 export function partition(string, separator) {
   const i = string.indexOf(separator)
   if (i === -1) {
@@ -47,16 +54,44 @@ export async function measure(name, block) {
   }
 }
 
+// Same as mesaure() but without the group, and no time shown on error
+export async function time(name, block) {
+  console.log(`> ${name}`)
+  const start = performance.now()
+  const value = await block()
+  const end = performance.now()
+
+  const duration = (end - start) / 1000.0
+  console.log(`Took ${duration.toFixed(2).padStart(6)} seconds`)
+  return value
+}
+
 export function isHeadVersion(rubyVersion) {
   return ['head', 'debug',  'mingw', 'mswin', 'ucrt'].includes(rubyVersion)
 }
 
-export function isStableVersion(rubyVersion) {
+export function isStableVersion(engine, rubyVersion) {
-  return /^\d+(\.\d+)*$/.test(rubyVersion)
+  if (engine.startsWith('truffleruby')) {
+    return /^\d+(\.\d+)*(-preview\d+)?$/.test(rubyVersion)
+  } else {
+    return /^\d+(\.\d+)*$/.test(rubyVersion)
+  }
+}
+
+export function hasBundlerDefaultGem(engine, rubyVersion) {
+  return isBundler1Default(engine, rubyVersion) || isBundler2Default(engine, rubyVersion)
 }
 
 export function isBundler1Default(engine, rubyVersion) {
-  return !isBundler2Default(engine, rubyVersion)
+  if (engine === 'ruby') {
+    return floatVersion(rubyVersion) >= 2.6 && floatVersion(rubyVersion) < 2.7
+  } else if (engine.startsWith('truffleruby')) {
+    return floatVersion(rubyVersion) < 21.0
+  } else if (engine === 'jruby') {
+    return false
+  } else {
+    return false
+  }
 }
 
 export function isBundler2Default(engine, rubyVersion) {
@@ -71,6 +106,43 @@ export function isBundler2Default(engine, rubyVersion) {
   }
 }
 
+export function isBundler2dot2Default(engine, rubyVersion) {
+  if (engine === 'ruby') {
+    return floatVersion(rubyVersion) >= 3.0
+  } else if (engine.startsWith('truffleruby')) {
+    return floatVersion(rubyVersion) >= 22.0
+  } else if (engine === 'jruby') {
+    return floatVersion(rubyVersion) >= 9.3
+  } else {
+    return false
+  }
+}
+
+export function targetRubyVersion(engine, rubyVersion) {
+  const version = floatVersion(rubyVersion)
+  if (engine === 'ruby') {
+    return version
+  } else if (engine === 'jruby') {
+    if (version === 9.1) {
+      return 2.3
+    } else if (version === 9.2) {
+      return 2.5
+    } else if (version === 9.3) {
+      return 2.6
+    }
+  } else if (engine.startsWith('truffleruby')) {
+    if (version < 21.0) {
+      return 2.6
+    } else if (version < 22.0) {
+      return 2.7
+    } else if (version < 23.0) {
+      return 3.0
+    }
+  }
+
+  return 9.9 // unknown, assume recent
+}
+
 export function floatVersion(rubyVersion) {
   const match = rubyVersion.match(/^\d+\.\d+/)
   if (match) {
@@ -90,75 +162,145 @@ export async function hashFile(file) {
   return hash.digest('hex')
 }
 
-function getImageOS() {
+const GitHubHostedPlatforms = [
-  const imageOS = process.env['ImageOS']
+  'ubuntu-20.04-x64',
-  if (!imageOS) {
+  'ubuntu-22.04-x64',
-    throw new Error('The environment variable ImageOS must be set')
+  'macos-11-x64',
-  }
+  'macos-12-x64',
-  return imageOS
+  'macos-13-x64',
-}
+  'windows-2019-x64',
-
+  'windows-2022-x64',
-export const supportedPlatforms = [
-  'ubuntu-18.04',
-  'ubuntu-20.04',
-  'ubuntu-22.04',
-  'macos-10.15',
-  'macos-11',
-  'macos-12',
-  'windows-2019',
-  'windows-2022',
 ]
 
+// Actually a self-hosted runner for which  the OS and OS version does not correspond to a GitHub-hosted runner image,
+export function isSelfHostedRunner() {
+  if (inputs.selfHosted === undefined) {
+    throw new Error('inputs.selfHosted should have been already set')
+  }
+
+  return inputs.selfHosted === 'true' ||
+    !GitHubHostedPlatforms.includes(getOSNameVersionArch())
+}
+
+export function selfHostedRunnerReason() {
+  if (inputs.selfHosted === 'true') {
+    return 'the self-hosted input was set'
+  } else if (!GitHubHostedPlatforms.includes(getOSNameVersionArch())) {
+    return 'the platform does not match a GitHub-hosted runner image (or that image is deprecated and no longer supported)'
+  } else {
+    return 'unknown reason'
+  }
+}
+
+let virtualEnvironmentName = undefined
+
 export function getVirtualEnvironmentName() {
-  const imageOS = getImageOS()
+  if (virtualEnvironmentName !== undefined) {
-
+    return virtualEnvironmentName
-  let match = imageOS.match(/^ubuntu(\d+)/) // e.g. ubuntu18
-  if (match) {
-    return `ubuntu-${match[1]}.04`
   }
 
-  match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11
+  const platform = os.platform()
-  if (match) {
+  let osName
-    if (match[2]) {
+  let osVersion
-      return `macos-${match[1]}.${match[2]}`
+  if (platform === 'linux') {
-    } else {
+    const info = linuxOSInfo({mode: 'sync'})
-      return `macos-${match[1]}`
+    osName = info.id
-    }
+    osVersion = info.version_id
+  } else if (platform === 'darwin') {
+    osName = 'macos'
+    osVersion = macosRelease().version
+  } else if (platform === 'win32') {
+    osName = 'windows'
+    osVersion = findWindowsVersion()
+  } else {
+    throw new Error(`Unknown platform ${platform}`)
   }
 
-  match = imageOS.match(/^win(\d+)/) // e.g. win19
+  virtualEnvironmentName = `${osName}-${osVersion}`
-  if (match) {
+  return virtualEnvironmentName
-    return `windows-20${match[1]}`
+}
-  }
 
-  throw new Error(`Unknown ImageOS ${imageOS}`)
+export function getOSNameVersionArch() {
+  return `${getVirtualEnvironmentName()}-${os.arch()}`
+}
+
+function findWindowsVersion() {
+  const version = os.version();
+  const match = version.match(/^Windows Server (\d+) Datacenter/)
+  if (match) {
+    return match[1]
+  } else {
+    throw new Error('Could not find Windows version')
+  }
 }
 
 export function shouldUseToolCache(engine, version) {
-  return engine === 'ruby' && !isHeadVersion(version)
+  return (engine === 'ruby' && !isHeadVersion(version)) || isSelfHostedRunner()
 }
 
-function getPlatformToolCache(platform) {
+export function getToolCachePath() {
-  // Hardcode paths rather than using $RUNNER_TOOL_CACHE because the prebuilt Rubies cannot be moved anyway
+  if (isSelfHostedRunner()) {
+    return getRunnerToolCache()
+  } else {
+    // Rubies prebuilt by this action embed this path rather than using $RUNNER_TOOL_CACHE
+    // so use that path is not isSelfHostedRunner()
+    return getDefaultToolCachePath()
+  }
+}
+
+export function getRunnerToolCache() {
+  const runnerToolCache = process.env['RUNNER_TOOL_CACHE']
+  if (!runnerToolCache) {
+    throw new Error('$RUNNER_TOOL_CACHE must be set')
+  }
+  return runnerToolCache
+}
+
+// Rubies prebuilt by this action embed this path rather than using $RUNNER_TOOL_CACHE
+function getDefaultToolCachePath() {
+  const platform = getVirtualEnvironmentName()
   if (platform.startsWith('ubuntu-')) {
     return '/opt/hostedtoolcache'
   } else if (platform.startsWith('macos-')) {
     return '/Users/runner/hostedtoolcache'
   } else if (platform.startsWith('windows-')) {
-    return 'C:/hostedtoolcache/windows'
+    return 'C:\\hostedtoolcache\\windows'
   } else {
     throw new Error('Unknown platform')
   }
 }
 
-export function getToolCacheRubyPrefix(platform, version) {
+// tc.find() but using RUNNER_TOOL_CACHE=getToolCachePath()
-  const toolCache = getPlatformToolCache(platform)
+export function toolCacheFind(engine, version) {
-  return path.join(toolCache, 'Ruby', version, 'x64')
+  const originalToolCache = getToolCachePath()
+  process.env['RUNNER_TOOL_CACHE'] = getToolCachePath()
+  try {
+    return tc.find(engineToToolCacheName(engine), version)
+  } finally {
+    process.env['RUNNER_TOOL_CACHE'] = originalToolCache
+  }
+}
+
+function engineToToolCacheName(engine) {
+  return {
+    ruby: 'Ruby',
+    jruby: 'JRuby',
+    truffleruby: 'TruffleRuby',
+    "truffleruby+graalvm": 'TruffleRubyGraalVM'
+  }[engine]
+}
+
+export function getToolCacheRubyPrefix(platform, engine, version) {
+  const toolCache = getToolCachePath()
+  return path.join(toolCache, engineToToolCacheName(engine), version, os.arch())
+}
+
+export function toolCacheCompleteFile(toolCacheRubyPrefix) {
+  return `${toolCacheRubyPrefix}.complete`
 }
 
 export function createToolCacheCompleteFile(toolCacheRubyPrefix) {
-  const completeFile = `${toolCacheRubyPrefix}.complete`
+  fs.writeFileSync(toolCacheCompleteFile(toolCacheRubyPrefix), '')
-  fs.writeFileSync(completeFile, '')
 }
 
 // convert windows path like C:\Users\runneradmin to /c/Users/runneradmin

gemfiles/bundler-dev.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "path"

gemfiles/bundler-dev.gemfile.lock

@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    path (2.0.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  path
+
+BUNDLED WITH
+   2.4.0.dev

gemfiles/gem_from_github.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+# Ruby < 2.3 only support Bundler 1, which no longer works with gem github:
+if RUBY_VERSION >= '2.3'
+  unless Gem::Version.new(Bundler::VERSION) >= Gem::Version.new("2.2.0")
+    raise "Expected Bundler 2.2+ is used on Ruby >= 2.3"
+  end
+
+  # From https://github.com/ruby/setup-ruby/issues/358#issuecomment-1195899304
+  # Tests using github: and the repository uses a non-master default branch.
+  gem 'rack-test', github: 'rack/rack-test'
+end

index.js

@@ -12,10 +12,11 @@ const windows = common.windows
 const inputDefaults = {
   'ruby-version': 'default',
   'rubygems': 'default',
-  'bundler': 'default',
+  'bundler': 'Gemfile.lock',
   'bundler-cache': 'false',
   'working-directory': '.',
   'cache-version': bundler.DEFAULT_CACHE_VERSION,
+  'self-hosted': 'false',
 }
 
 // entry point when this action is run on its own
@@ -23,7 +24,11 @@ export async function run() {
   try {
     await setupRuby()
   } catch (error) {
-    core.setFailed(error.stack)
+    if (/\bprocess\b.+\bfailed\b/.test(error.message)) {
+      core.setFailed(error.message)
+    } else {
+      core.setFailed(error.stack)
+    }
   }
 }
 
@@ -35,6 +40,7 @@ export async function setupRuby(options = {}) {
       inputs[key] = core.getInput(key) || inputDefaults[key]
     }
   }
+  common.inputs.selfHosted = inputs['self-hosted']
 
   process.chdir(inputs['working-directory'])
 
@@ -42,7 +48,7 @@ export async function setupRuby(options = {}) {
   const [engine, parsedVersion] = parseRubyEngineAndVersion(inputs['ruby-version'])
 
   let installer
-  if (platform.startsWith('windows-') && engine === 'ruby') {
+  if (platform.startsWith('windows-') && engine === 'ruby' && !common.isSelfHostedRunner()) {
     installer = require('./windows')
   } else {
     installer = require('./ruby-builder')
@@ -56,7 +62,7 @@ export async function setupRuby(options = {}) {
 
   // JRuby can use compiled extension code, so make sure gcc exists.
   // As of Jan-2022, JRuby compiles against msvcrt.
-  if (platform.startsWith('windows') && (engine === 'jruby') && 
+  if (platform.startsWith('windows') && engine === 'jruby' &&
     !fs.existsSync('C:\\msys64\\mingw64\\bin\\gcc.exe')) {
     await require('./windows').installJRubyTools()
   }
@@ -88,7 +94,7 @@ export async function setupRuby(options = {}) {
   }
 
   if (inputs['bundler-cache'] === 'true') {
-    await common.measure('bundle install', async () =>
+    await common.time('bundle install', async () =>
       bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
   }
 
@@ -139,7 +145,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
   if (!engineVersions.includes(parsedVersion)) {
     const latestToFirstVersion = engineVersions.slice().reverse()
     // Try to match stable versions first, so an empty version (engine-only) matches the latest stable version
-    let found = latestToFirstVersion.find(v => common.isStableVersion(v) && v.startsWith(parsedVersion))
+    let found = latestToFirstVersion.find(v => common.isStableVersion(engine, v) && v.startsWith(parsedVersion))
     if (!found) {
       // Exclude head versions, they must be exact matches
       found = latestToFirstVersion.find(v => !common.isHeadVersion(v) && v.startsWith(parsedVersion))
@@ -150,8 +156,7 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
     } else {
       throw new Error(`Unknown version ${parsedVersion} for ${engine} on ${platform}
         available versions for ${engine} on ${platform}: ${engineVersions.join(', ')}
-        Make sure you use the latest version of the action with - uses: ruby/setup-ruby@v1
+        Make sure you use the latest version of the action with - uses: ruby/setup-ruby@v1`)
-        File an issue at https://github.com/ruby/setup-ruby/issues if you would like support for a new version`)
     }
   }
 

new-versions.rb

@@ -1,24 +1,24 @@
-engine_input, version = ARGV.fetch(0).split('-', 2)
+versions = ARGV.fetch(0).split(',').map(&:strip)
+p versions
 
-if engine_input == 'windows'
+versions.each do |engine_version|
-  require_relative 'generate-windows-versions'
+  puts engine_version
-  exit
+  engine, version = engine_version.split('-', 2)
-end
+  p [engine, version]
 
-MATCH = case engine_input
+  if engine == 'windows'
-when 'ruby', 'jruby'
+    require_relative 'generate-windows-versions'
-  /^\d+\.\d+\./
+    exit
-when 'truffleruby'
+  end
-  /^\d+\./
-end
 
-raise unless version[MATCH]
+  match = case engine
+  when 'ruby', 'jruby'
+    /^\d+\.\d+\./
+  when 'truffleruby', 'truffleruby+graalvm'
+    /^\d+\./
+  end
 
-engines = [engine_input]
+  raise engine_version unless version[match]
-engines << 'truffleruby+graalvm' if engine_input == 'truffleruby'
-
-engines.each do |engine|
-  puts engine
 
   # Update ruby-builder-versions.json
   file = "#{__dir__}/ruby-builder-versions.json"
@@ -35,7 +35,7 @@ engines.each do |engine|
   puts lines[from..to]
 
   release_line = lines[from..to].find { |line|
-    v = line[/"([^"]+)"/, 1] and v[MATCH] == version[MATCH]
+    v = line[/"([^"]+)"/, 1] and v[match] == version[match]
   }
 
   if release_line
@@ -51,7 +51,7 @@ engines.each do |engine|
   file = "#{__dir__}/README.md"
   lines = File.readlines(file)
   engine_line = lines.find { |line| line.start_with?("| `#{engine}`") }
-  engine_line.sub!(/(.+ (?:-|until)) (\d+(?:\.\d+)+)/) do
+  engine_line.sub!(/(.+ (?:-|until)) (\d+(?:\.\d+)+(?:-\w+)?)/) do
     if Gem::Version.new(version) > Gem::Version.new($2)
       "#{$1} #{version}"
     else

package.json

@@ -22,14 +22,16 @@
   },
   "homepage": "https://github.com/ruby/setup-ruby",
   "dependencies": {
-    "@actions/cache": "^1.0.11",
+    "@actions/cache": "3.0.6",
-    "@actions/core": "^1.6.0",
+    "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
     "@actions/io": "^1.1.2",
-    "@actions/tool-cache": "^1.7.2",
+    "@actions/tool-cache": "^2",
-    "semver": "^6.3.0"
+    "linux-os-info": "^2.0.0",
+    "macos-release": "^3.1.0",
+    "semver": "^7.3.7"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.31.1"
+    "@vercel/ncc": "^0.33.4"
   }
 }

pre-commit

@@ -1,5 +1,8 @@
-#!/usr/bin/sh
+#!/bin/sh
 set -e
-yarn install
+
-yarn run package
+if [ "$(dirname "$0")" != ".git/hooks" ] || git diff --cached --name-only | grep -E '.(js|json)$|yarn.lock'; then
-exec git add dist/index.js
+  yarn install
+  yarn run package
+  exec git add dist/index.js
+fi

ruby-builder-versions.json

@@ -8,28 +8,32 @@
     "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9", "2.4.10",
     "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7", "2.5.8", "2.5.9",
     "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5", "2.6.6", "2.6.7", "2.6.8", "2.6.9", "2.6.10",
-    "2.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4", "2.7.5", "2.7.6",
+    "2.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4", "2.7.5", "2.7.6", "2.7.7", "2.7.8",
-    "3.0.0-preview1", "3.0.0-preview2", "3.0.0-rc1", "3.0.0", "3.0.1", "3.0.2", "3.0.3", "3.0.4",
+    "3.0.0-preview1", "3.0.0-preview2", "3.0.0-rc1", "3.0.0", "3.0.1", "3.0.2", "3.0.3", "3.0.4", "3.0.5", "3.0.6",
-    "3.1.0-preview1", "3.1.0", "3.1.1", "3.1.2",
+    "3.1.0-preview1", "3.1.0", "3.1.1", "3.1.2", "3.1.3", "3.1.4",
-    "3.2.0-preview1",
+    "3.2.0-preview1", "3.2.0-preview2", "3.2.0-preview3", "3.2.0-rc1", "3.2.0", "3.2.1", "3.2.2",
+    "3.3.0-preview1",
     "head", "debug"
   ],
   "jruby": [
     "9.1.17.0",
-    "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0", "9.2.20.1",
+    "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0", "9.2.20.1", "9.2.21.0",
-    "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0",
+    "9.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.0", "9.3.4.0", "9.3.6.0", "9.3.7.0", "9.3.8.0", "9.3.9.0", "9.3.10.0",
+    "9.4.0.0", "9.4.1.0", "9.4.2.0",
     "head"
   ],
   "truffleruby": [
     "19.3.0", "19.3.1",
     "20.0.0", "20.1.0", "20.2.0", "20.3.0",
     "21.0.0", "21.1.0", "21.2.0", "21.2.0.1", "21.3.0",
-    "22.0.0.2", "22.1.0",
+    "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
+    "23.0.0-preview1",
     "head"
   ],
   "truffleruby+graalvm": [
     "21.2.0", "21.3.0",
-    "22.0.0.2", "22.1.0",
+    "22.0.0.2", "22.1.0", "22.2.0", "22.3.0", "22.3.1",
+    "23.0.0-preview1",
     "head"
   ]
 }

ruby-builder.js

@@ -1,6 +1,7 @@
 const os = require('os')
 const fs = require('fs')
 const path = require('path')
+const core = require('@actions/core')
 const exec = require('@actions/exec')
 const io = require('@actions/io')
 const tc = require('@actions/tool-cache')
@@ -13,28 +14,31 @@ const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
 const windows = common.windows
 
 export function getAvailableVersions(platform, engine) {
-  if (!common.supportedPlatforms.includes(platform)) {
-    throw new Error(`Unsupported platform ${platform}`)
-  }
-
-  if (platform === 'ubuntu-22.04') {
-    const rubyVersions = rubyBuilderVersions['ruby']
-    return {
-      ruby: rubyVersions.slice(rubyVersions.indexOf('3.1.0')),
-    }[engine]
-  }
-
   return rubyBuilderVersions[engine]
 }
 
 export async function install(platform, engine, version) {
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
-    inToolCache = tc.find('Ruby', version)
+    inToolCache = common.toolCacheFind(engine, version)
     if (inToolCache) {
       rubyPrefix = inToolCache
     } else {
-      rubyPrefix = common.getToolCacheRubyPrefix(platform, version)
+      const toolCacheRubyPrefix = common.getToolCacheRubyPrefix(platform, engine, version)
+      if (common.isSelfHostedRunner()) {
+        const rubyBuildDefinition = engine === 'ruby' ? version : `${engine}-${version}`
+        core.error(
+          `The current runner (${common.getOSNameVersionArch()}) was detected as self-hosted because ${common.selfHostedRunnerReason()}.\n` +
+          `In such a case, you should install Ruby in the $RUNNER_TOOL_CACHE yourself, for example using https://github.com/rbenv/ruby-build\n` +
+          `You can take inspiration from this workflow for more details: https://github.com/ruby/ruby-builder/blob/master/.github/workflows/build.yml\n` +
+          `$ ruby-build ${rubyBuildDefinition} ${toolCacheRubyPrefix}\n` +
+          `Once that completes successfully, mark it as complete with:\n` +
+          `$ touch ${common.toolCacheCompleteFile(toolCacheRubyPrefix)}\n` +
+          `It is your responsibility to ensure installing Ruby like that is not done in parallel.\n`)
+        process.exit(1)
+      } else {
+        rubyPrefix = toolCacheRubyPrefix
+      }
     }
   } else if (windows) {
     rubyPrefix = path.join(`${common.drive}:`, `${engine}-${version}`)
@@ -46,7 +50,7 @@ export async function install(platform, engine, version) {
   common.setupPath([path.join(rubyPrefix, 'bin')])
 
   if (!inToolCache) {
-    await preparePrefix(rubyPrefix)
+    await io.mkdirP(rubyPrefix)
     if (engine === 'truffleruby+graalvm') {
       await installWithRubyBuild(engine, version, rubyPrefix)
     } else {
@@ -57,15 +61,6 @@ export async function install(platform, engine, version) {
   return rubyPrefix
 }
 
-async function preparePrefix(rubyPrefix) {
-  const parentDir = path.dirname(rubyPrefix)
-
-  await io.rmRF(rubyPrefix)
-  if (!(fs.existsSync(parentDir) && fs.statSync(parentDir).isDirectory())) {
-    await io.mkdirP(parentDir)
-  }
-}
-
 async function installWithRubyBuild(engine, version, rubyPrefix) {
   const tmp = process.env['RUNNER_TEMP'] || os.tmpdir()
   const rubyBuildDir = path.join(tmp, 'ruby-build-for-setup-ruby')

windows-versions.json

@@ -40,14 +40,23 @@
   "2.7.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.4-1/rubyinstaller-2.7.4-1-x64.7z",
   "2.7.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.5-1/rubyinstaller-2.7.5-1-x64.7z",
   "2.7.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.6-1/rubyinstaller-2.7.6-1-x64.7z",
+  "2.7.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.7-1/rubyinstaller-2.7.7-1-x64.7z",
+  "2.7.8": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.8-1/rubyinstaller-2.7.8-1-x64.7z",
   "3.0.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.0-1/rubyinstaller-3.0.0-1-x64.7z",
   "3.0.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.1-1/rubyinstaller-3.0.1-1-x64.7z",
   "3.0.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.2-1/rubyinstaller-3.0.2-1-x64.7z",
   "3.0.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.3-1/rubyinstaller-3.0.3-1-x64.7z",
   "3.0.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.4-1/rubyinstaller-3.0.4-1-x64.7z",
+  "3.0.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.5-1/rubyinstaller-3.0.5-1-x64.7z",
+  "3.0.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.6-1/rubyinstaller-3.0.6-1-x64.7z",
   "3.1.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.0-1/rubyinstaller-3.1.0-1-x64.7z",
   "3.1.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.1-1/rubyinstaller-3.1.1-1-x64.7z",
   "3.1.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.2-1/rubyinstaller-3.1.2-1-x64.7z",
+  "3.1.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.3-1/rubyinstaller-3.1.3-1-x64.7z",
+  "3.1.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.4-1/rubyinstaller-3.1.4-1-x64.7z",
+  "3.2.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.0-1/rubyinstaller-3.2.0-1-x64.7z",
+  "3.2.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.1-1/rubyinstaller-3.2.1-1-x64.7z",
+  "3.2.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.2.2-1/rubyinstaller-3.2.2-1-x64.7z",
   "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
   "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
   "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z",

windows.js

@@ -1,5 +1,7 @@
-// Most of this logic is from
+// 7z arguments
-// https://github.com/MSP-Greg/actions-ruby/blob/master/lib/main.js
+//   -aoa overwrite existing, -bd disable progress indicator
+
+// OpenSSL version detection is needed in installGCCTools and installJRubyTools
 
 const fs = require('fs')
 const path = require('path')
@@ -13,22 +15,25 @@ const rubyInstallerVersions = require('./windows-versions.json')
 
 const drive = common.drive
 
-const msys2BasePath = 'C:\\msys64'
+const msys2GCCReleaseURI  = 'https://github.com/ruby/setup-msys2-gcc/releases/download'
 
-// needed for 2.0-2.3, and mswin, cert file used by Git for Windows
+const msys2BasePath = process.env['GHCUP_MSYS2']
-const certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem'
+const vcPkgBasePath = process.env['VCPKG_INSTALLATION_ROOT']
 
-// location & path for old RubyInstaller DevKit (MSYS1), Ruby 2.0-2.3
+// needed for Ruby 2.0-2.3, cert file used by Git for Windows
+let certFile = 'C:\\Program Files\\Git\\mingw64\\etc\\ssl\\cert.pem'
+if (!fs.existsSync(certFile)) {
+  certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem'
+  if (!fs.existsSync(certFile)) {
+    throw new Error("Cannot find Git's cert file")
+  }
+}
+
+// location & path for old RubyInstaller DevKit (MSYS1), used with Ruby 2.0-2.3
 const msys1 = `${drive}:\\DevKit64`
 const msysPathEntries = [`${msys1}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys1}\\mingw\\bin`, `${msys1}\\bin`]
 
-const virtualEnv = common.getVirtualEnvironmentName()
-
 export function getAvailableVersions(platform, engine) {
-  if (!common.supportedPlatforms.includes(platform)) {
-    throw new Error(`Unsupported platform ${platform}`)
-  }
-
   if (engine === 'ruby') {
     return Object.keys(rubyInstallerVersions)
   } else {
@@ -41,7 +46,7 @@ export async function install(platform, engine, version) {
 
   // The windows-2016 and windows-2019 images have MSYS2 build tools (C:/msys64/usr)
   // and MinGW build tools installed.  The windows-2022 image has neither.
-  const hasMSYS2PreInstalled = ['windows-2019', 'windows-2016'].includes(virtualEnv)
+  const hasMSYS2PreInstalled = ['windows-2019', 'windows-2016'].includes(platform)
 
   if (!url.endsWith('.7z')) {
     throw new Error(`URL should end in .7z: ${url}`)
@@ -50,11 +55,11 @@ export async function install(platform, engine, version) {
 
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
-    inToolCache = tc.find('Ruby', version)
+    inToolCache = common.toolCacheFind(engine, version)
     if (inToolCache) {
       rubyPrefix = inToolCache
     } else {
-      rubyPrefix = common.getToolCacheRubyPrefix(platform, version)
+      rubyPrefix = common.getToolCacheRubyPrefix(platform, engine, version)
     }
   } else {
     rubyPrefix = `${drive}:\\${base}`
@@ -77,7 +82,11 @@ export async function install(platform, engine, version) {
   // windows 2016 and 2019 need ucrt64 installed, 2022 and future images need
   // ucrt64 or mingw64 installed, depending on Ruby version
   if (((msys2Type === 'ucrt64') || !hasMSYS2PreInstalled) && common.floatVersion(version) >= 2.4) {
-    await installGCCTools(msys2Type)
+    await installGCCTools(msys2Type, version)
+  }
+
+  if (version === 'mswin') {
+    await installVCPkg()
   }
 
   const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
@@ -90,15 +99,24 @@ 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) {
+async function installGCCTools(type, version) {
-  const downloadPath = await common.measure(`Downloading ${type} build tools`, async () => {
+  // 2022-Dec ruby/msys2-gcc-pkgs now uses a suffix to delineate different archive versions.
-    let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/${type}.7z`
+  // At present, the only use is to indicate the included OpenSSL version.
+  // With no suffix, archives include OpenSSL 1.1.1, with a '-3.0' suffix, they include
+  // OpenSSL 3.0.x.  Note that the mswin archive uses OpenSSL 3.
+  // As of Jan-2023, OpenSSL 3 is used in Ruby 3.2 & all head versions.  MSYS2 updated
+  // to OpenSSL 3 on 14-Jan-2023.
+  let suffix = ''
+  if (common.isHeadVersion(version) || common.floatVersion(version) >= 3.2) {
+    suffix = '-3.0'
+  }
+  const downloadPath = await common.measure(`Downloading ${type}${suffix} build tools`, async () => {
+    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/${type}${suffix}.7z`
     console.log(url)
     return await tc.downloadTool(url)
   })
 
-  await common.measure(`Extracting  ${type} build tools`, async () =>
+  await common.measure(`Extracting  ${type}${suffix} build tools`, async () =>
-    // -aoa overwrite existing, -bd disable progress indicator
     exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys2BasePath}`], { silent: true }))
 }
 
@@ -106,17 +124,16 @@ async function installGCCTools(type) {
 // A subset of the MSYS2 base-devel group
 async function installMSYS2Tools() {
   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`
+    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/msys2.7z`
     console.log(url)
     return await tc.downloadTool(url)
   })
 
   // need to remove all directories, since they may indicate old packages are installed,
   // otherwise, error of "error: duplicated database entry"
-  fs.rmdirSync(`${msys2BasePath}\\var\\lib\\pacman\\local`, { recursive: true, force: true })
+  fs.rmSync(`${msys2BasePath}\\var\\lib\\pacman\\local`, { recursive: true, force: true })
 
   await common.measure(`Extracting  msys2 build tools`, async () =>
-    // -aoa overwrite existing, -bd disable progress indicator
     exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys2BasePath}`], { silent: true }))
 }
 
@@ -124,7 +141,20 @@ async function installMSYS2Tools() {
 // windows-2022 and later images
 export async function installJRubyTools() {
   await installMSYS2Tools()
-  await installGCCTools('mingw64')
+  // Will need to add OpenSSL version detection when JRuby uses OpenSSL 3.0 ?
+  await installGCCTools('mingw64', '2.7')
+}
+
+// Install vcpkg files needed to build mswin Ruby
+async function installVCPkg() {
+  const downloadPath = await common.measure(`Downloading mswin vcpkg packages`, async () => {
+    let url = `${msys2GCCReleaseURI}/msys2-gcc-pkgs/mswin.7z`
+    console.log(url)
+    return await tc.downloadTool(url)
+  })
+
+  await common.measure(`Extracting  mswin vcpkg packages`, async () =>
+    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${vcPkgBasePath}`], { silent: true }))
 }
 
 async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
@@ -136,7 +166,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
   })
 
   await common.measure('Extracting  Ruby', async () =>
-    // -bd disable progress indicator, -xr extract but exclude share\doc files
+    // -xr extract but exclude share\doc files
     exec.exec('7z', ['x', downloadPath, '-bd', `-xr!${base}\\share\\doc`, `-o${parentDir}`], { silent: true }))
 
   if (base !== path.basename(rubyPrefix)) {
@@ -182,19 +212,6 @@ async function installMSYS1(version) {
 
 async function setupMSWin() {
   core.exportVariable('MAKE', 'nmake.exe')
-
-  // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL
-  const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs'
-  if (!fs.existsSync(certsDir)) {
-    fs.mkdirSync(certsDir)
-  }
-
-  // cert.pem location is hard-coded by OpenSSL msvc builds
-  const cert = 'C:\\Program Files\\Common Files\\SSL\\cert.pem'
-  if (!fs.existsSync(cert)) {
-    fs.copyFileSync(certFile, cert)
-  }
-
   return await common.measure('Setting up MSVC environment', async () => addVCVARSEnv())
 }
 

yarn.lock

@@ -1,411 +1,428 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
+# yarn lockfile v1
-
+
-
+
-"@actions/cache@^1.0.11":
+"@actions/cache@3.0.6":
-  version "1.0.11"
+  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-1.0.11.tgz#db7909ba7f7e7bc9bd1a761c172c48807586b996"
+  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-3.0.6.tgz#b76c51a78c927fcf0eb631b96a07e34f575c422b"
-  integrity sha512-L+VCF1JpFePAzxkYtpwYDWnd0WzSU1DoNPE2cuINKpEie27ONH0Cpqt40cG8NiJW4zbZLN+kNkEDo3F2MkUuRw==
+  integrity sha512-Tttit+nqmxgb2M5Ufj5p8Lwd+fx329HOTLzxMrY4aaaZqBzqetgWlEfszMyiXfX4cJML+bzLJbyD9rNYt8TJ8g==
-  dependencies:
+  dependencies:
-    "@actions/core" "^1.2.6"
+    "@actions/core" "^1.10.0"
-    "@actions/exec" "^1.0.1"
+    "@actions/exec" "^1.0.1"
-    "@actions/glob" "^0.1.0"
+    "@actions/glob" "^0.1.0"
-    "@actions/http-client" "^1.0.9"
+    "@actions/http-client" "^2.0.1"
-    "@actions/io" "^1.0.1"
+    "@actions/io" "^1.0.1"
-    "@azure/ms-rest-js" "^2.6.0"
+    "@azure/abort-controller" "^1.1.0"
-    "@azure/storage-blob" "^12.8.0"
+    "@azure/ms-rest-js" "^2.6.0"
-    semver "^6.1.0"
+    "@azure/storage-blob" "^12.8.0"
-    uuid "^3.3.3"
+    semver "^6.1.0"
-
+    uuid "^3.3.3"
-"@actions/core@^1.2.6", "@actions/core@^1.6.0":
+
-  version "1.6.0"
+"@actions/core@^1.10.0", "@actions/core@^1.2.6":
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.6.0.tgz#0568e47039bfb6a9170393a73f3b7eb3b22462cb"
+  version "1.10.0"
-  integrity sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.10.0.tgz#44551c3c71163949a2f06e94d9ca2157a0cfac4f"
-  dependencies:
+  integrity sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==
-    "@actions/http-client" "^1.0.11"
+  dependencies:
-
+    "@actions/http-client" "^2.0.1"
-"@actions/exec@^1.0.0", "@actions/exec@^1.0.1", "@actions/exec@^1.1.1":
+    uuid "^8.3.2"
-  version "1.1.1"
+
-  resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.1.tgz#2e43f28c54022537172819a7cf886c844221a611"
+"@actions/exec@^1.0.0", "@actions/exec@^1.0.1", "@actions/exec@^1.1.1":
-  integrity sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==
+  version "1.1.1"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.1.tgz#2e43f28c54022537172819a7cf886c844221a611"
-    "@actions/io" "^1.0.1"
+  integrity sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==
-
+  dependencies:
-"@actions/glob@^0.1.0":
+    "@actions/io" "^1.0.1"
-  version "0.1.2"
+
-  resolved "https://registry.yarnpkg.com/@actions/glob/-/glob-0.1.2.tgz#9685ed2d6583093479c8f137d067c4329d7d0974"
+"@actions/glob@^0.1.0":
-  integrity sha512-SclLR7Ia5sEqjkJTPs7Sd86maMDw43p769YxBOxvPvEWuPEhpAnBsQfENOpXjFYMmhCqd127bmf+YdvJqVqR4A==
+  version "0.1.2"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@actions/glob/-/glob-0.1.2.tgz#9685ed2d6583093479c8f137d067c4329d7d0974"
-    "@actions/core" "^1.2.6"
+  integrity sha512-SclLR7Ia5sEqjkJTPs7Sd86maMDw43p769YxBOxvPvEWuPEhpAnBsQfENOpXjFYMmhCqd127bmf+YdvJqVqR4A==
-    minimatch "^3.0.4"
+  dependencies:
-
+    "@actions/core" "^1.2.6"
-"@actions/http-client@^1.0.11", "@actions/http-client@^1.0.8", "@actions/http-client@^1.0.9":
+    minimatch "^3.0.4"
-  version "1.0.11"
+
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
+"@actions/http-client@^2.0.1":
-  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
+  version "2.1.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.1.0.tgz#b6d8c3934727d6a50d10d19f00a711a964599a9f"
-    tunnel "0.0.6"
+  integrity sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==
-
+  dependencies:
-"@actions/io@^1.0.1", "@actions/io@^1.1.1", "@actions/io@^1.1.2":
+    tunnel "^0.0.6"
-  version "1.1.2"
+
-  resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.2.tgz#766ac09674a289ce0f1550ffe0a6eac9261a8ea9"
+"@actions/io@^1.0.1", "@actions/io@^1.1.1", "@actions/io@^1.1.2":
-  integrity sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==
+  version "1.1.2"
-
+  resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.2.tgz#766ac09674a289ce0f1550ffe0a6eac9261a8ea9"
-"@actions/tool-cache@^1.7.2":
+  integrity sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==
-  version "1.7.2"
+
-  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.7.2.tgz#389ad15916f91999959c6b2865144839ecc571a9"
+"@actions/tool-cache@^2":
-  integrity sha512-GYlcgg/PK2RWBrGG2sFg6s7im3S94LMKuqAv8UPDq/pGTZbuEvmN4a95Fn1Z19OE+vt7UbUHeewOD5tEBT+4TQ==
+  version "2.0.1"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-2.0.1.tgz#8a649b9c07838d9d750c9864814e66a7660ab720"
-    "@actions/core" "^1.2.6"
+  integrity sha512-iPU+mNwrbA8jodY8eyo/0S/QqCKDajiR8OxWTnSk/SnYg0sj8Hp4QcUEVC1YFpHWXtrfbQrE13Jz4k4HXJQKcA==
-    "@actions/exec" "^1.0.0"
+  dependencies:
-    "@actions/http-client" "^1.0.8"
+    "@actions/core" "^1.2.6"
-    "@actions/io" "^1.1.1"
+    "@actions/exec" "^1.0.0"
-    semver "^6.1.0"
+    "@actions/http-client" "^2.0.1"
-    uuid "^3.3.2"
+    "@actions/io" "^1.1.1"
-
+    semver "^6.1.0"
-"@azure/abort-controller@^1.0.0":
+    uuid "^3.3.2"
-  version "1.0.4"
+
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz#fd3c4d46c8ed67aace42498c8e2270960250eafd"
+"@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.1.0":
-  integrity sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==
+  version "1.1.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.1.0.tgz#788ee78457a55af8a1ad342acb182383d2119249"
-    tslib "^2.0.0"
+  integrity sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==
-
+  dependencies:
-"@azure/core-asynciterator-polyfill@^1.0.0":
+    tslib "^2.2.0"
-  version "1.0.2"
+
-  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz#0dd3849fb8d97f062a39db0e5cadc9ffaf861fec"
+"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.3.0":
-  integrity sha512-3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw==
+  version "1.4.0"
-
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.4.0.tgz#6fa9661c1705857820dbc216df5ba5665ac36a9e"
-"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.3.0":
+  integrity sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==
-  version "1.3.2"
+  dependencies:
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.2.tgz#6a2c248576c26df365f6c7881ca04b7f6d08e3d0"
+    "@azure/abort-controller" "^1.0.0"
-  integrity sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==
+    tslib "^2.2.0"
-  dependencies:
+
-    "@azure/abort-controller" "^1.0.0"
+"@azure/core-http@^3.0.0":
-    tslib "^2.2.0"
+  version "3.0.0"
-
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-3.0.0.tgz#345845f9ba479a5ee41efc3fd7a13e82d2a0ec47"
-"@azure/core-http@^2.0.0":
+  integrity sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==
-  version "2.2.4"
+  dependencies:
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.2.4.tgz#df5a5b4138dbbc4299879f2fc6f257d0a5f0401e"
+    "@azure/abort-controller" "^1.0.0"
-  integrity sha512-QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A==
+    "@azure/core-auth" "^1.3.0"
-  dependencies:
+    "@azure/core-tracing" "1.0.0-preview.13"
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-util" "^1.1.1"
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
+    "@azure/logger" "^1.0.0"
-    "@azure/core-auth" "^1.3.0"
+    "@types/node-fetch" "^2.5.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
+    "@types/tunnel" "^0.0.3"
-    "@azure/logger" "^1.0.0"
+    form-data "^4.0.0"
-    "@types/node-fetch" "^2.5.0"
+    node-fetch "^2.6.7"
-    "@types/tunnel" "^0.0.3"
+    process "^0.11.10"
-    form-data "^4.0.0"
+    tslib "^2.2.0"
-    node-fetch "^2.6.7"
+    tunnel "^0.0.6"
-    process "^0.11.10"
+    uuid "^8.3.0"
-    tough-cookie "^4.0.0"
+    xml2js "^0.4.19"
-    tslib "^2.2.0"
+
-    tunnel "^0.0.6"
+"@azure/core-lro@^2.2.0":
-    uuid "^8.3.0"
+  version "2.5.1"
-    xml2js "^0.4.19"
+  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.5.1.tgz#9c6be24b84f8a8c8e8ac376c5018460c5a585d0b"
-
+  integrity sha512-JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ==
-"@azure/core-lro@^2.2.0":
+  dependencies:
-  version "2.2.4"
+    "@azure/abort-controller" "^1.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.4.tgz#42fbf4ae98093c59005206a4437ddcd057c57ca1"
+    "@azure/logger" "^1.0.0"
-  integrity sha512-e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ==
+    tslib "^2.2.0"
-  dependencies:
+
-    "@azure/abort-controller" "^1.0.0"
+"@azure/core-paging@^1.1.1":
-    "@azure/core-tracing" "1.0.0-preview.13"
+  version "1.5.0"
-    "@azure/logger" "^1.0.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.5.0.tgz#5a5b09353e636072e6a7fc38f7879e11d0afb15f"
-    tslib "^2.2.0"
+  integrity sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==
-
+  dependencies:
-"@azure/core-paging@^1.1.1":
+    tslib "^2.2.0"
-  version "1.2.1"
+
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.2.1.tgz#1b884f563b6e49971e9a922da3c7a20931867b54"
+"@azure/core-tracing@1.0.0-preview.13":
-  integrity sha512-UtH5iMlYsvg+nQYIl4UHlvvSrsBjOlRF4fs0j7mxd3rWdAStrKYrh2durOpHs5C9yZbVhsVDaisoyaf/lL1EVA==
+  version "1.0.0-preview.13"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
+  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
-    tslib "^2.2.0"
+  dependencies:
-
+    "@opentelemetry/api" "^1.0.1"
-"@azure/core-tracing@1.0.0-preview.13":
+    tslib "^2.2.0"
-  version "1.0.0-preview.13"
+
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
+"@azure/core-util@^1.1.1":
-  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
+  version "1.2.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.2.0.tgz#3499deba1fc36dda6f1912b791809b6f15d4a392"
-    "@opentelemetry/api" "^1.0.1"
+  integrity sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==
-    tslib "^2.2.0"
+  dependencies:
-
+    "@azure/abort-controller" "^1.0.0"
-"@azure/logger@^1.0.0":
+    tslib "^2.2.0"
-  version "1.0.3"
+
-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96"
+"@azure/logger@^1.0.0":
-  integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==
+  version "1.0.4"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.4.tgz#28bc6d0e5b3c38ef29296b32d35da4e483593fa1"
-    tslib "^2.2.0"
+  integrity sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==
-
+  dependencies:
-"@azure/ms-rest-js@^2.6.0":
+    tslib "^2.2.0"
-  version "2.6.1"
+
-  resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz#4f94688a750d51afcbab4b55d6ecb9d3df4ddd94"
+"@azure/ms-rest-js@^2.6.0":
-  integrity sha512-LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw==
+  version "2.6.4"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.6.4.tgz#b0a0f89841434471adf757d09e7e39e8ecfcd650"
-    "@azure/core-auth" "^1.1.4"
+  integrity sha512-2sbOpGhlBfv9itWdF7Qlk0CmoQCARxe5unwjNOprU7OdgEgabQncZ35L5u1A+zgdkVtNYF9Eo6XAhXzTweIhag==
-    abort-controller "^3.0.0"
+  dependencies:
-    form-data "^2.5.0"
+    "@azure/core-auth" "^1.1.4"
-    node-fetch "^2.6.7"
+    abort-controller "^3.0.0"
-    tough-cookie "^3.0.1"
+    form-data "^2.5.0"
-    tslib "^1.10.0"
+    node-fetch "^2.6.7"
-    tunnel "0.0.6"
+    tough-cookie "^3.0.1"
-    uuid "^8.3.2"
+    tslib "^1.10.0"
-    xml2js "^0.4.19"
+    tunnel "0.0.6"
-
+    uuid "^8.3.2"
-"@azure/storage-blob@^12.8.0":
+    xml2js "^0.4.19"
-  version "12.9.0"
+
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.9.0.tgz#4cbd8b4c7a47dd064867430db892f4ef2d8f17ab"
+"@azure/storage-blob@^12.8.0":
-  integrity sha512-ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg==
+  version "12.13.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.13.0.tgz#9209cbb5c2cd463fb967a0f2ae144ace20879160"
-    "@azure/abort-controller" "^1.0.0"
+  integrity sha512-t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA==
-    "@azure/core-http" "^2.0.0"
+  dependencies:
-    "@azure/core-lro" "^2.2.0"
+    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-paging" "^1.1.1"
+    "@azure/core-http" "^3.0.0"
-    "@azure/core-tracing" "1.0.0-preview.13"
+    "@azure/core-lro" "^2.2.0"
-    "@azure/logger" "^1.0.0"
+    "@azure/core-paging" "^1.1.1"
-    events "^3.0.0"
+    "@azure/core-tracing" "1.0.0-preview.13"
-    tslib "^2.2.0"
+    "@azure/logger" "^1.0.0"
-
+    events "^3.0.0"
-"@opentelemetry/api@^1.0.1":
+    tslib "^2.2.0"
-  version "1.0.4"
+
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.4.tgz#a167e46c10d05a07ab299fc518793b0cff8f6924"
+"@opentelemetry/api@^1.0.1":
-  integrity sha512-BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog==
+  version "1.4.1"
-
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f"
-"@types/node-fetch@^2.5.0":
+  integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==
-  version "2.6.1"
+
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
+"@types/node-fetch@^2.5.0":
-  integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA==
+  version "2.6.2"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da"
-    "@types/node" "*"
+  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
-    form-data "^3.0.0"
+  dependencies:
-
+    "@types/node" "*"
-"@types/node@*":
+    form-data "^3.0.0"
-  version "17.0.24"
+
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f"
+"@types/node@*":
-  integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==
+  version "18.15.3"
-
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.3.tgz#f0b991c32cfc6a4e7f3399d6cb4b8cf9a0315014"
-"@types/tunnel@^0.0.3":
+  integrity sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==
-  version "0.0.3"
+
-  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
+"@types/tunnel@^0.0.3":
-  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
+  version "0.0.3"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
-    "@types/node" "*"
+  integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==
-
+  dependencies:
-"@vercel/ncc@^0.31.1":
+    "@types/node" "*"
-  version "0.31.1"
+
-  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.31.1.tgz#9346c7e59326f5eeac75c0286e47df94c2d6d8f7"
+"@vercel/ncc@^0.33.4":
-  integrity sha512-g0FAxwdViI6UzsiVz5HssIHqjcPa1EHL6h+2dcJD893SoCJaGdqqgUF09xnMW6goWnnhbLvgiKlgJWrJa+7qYA==
+  version "0.33.4"
-
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.33.4.tgz#e44a87511f583b7ba88e4b9ae90eeb7ba252b872"
-abort-controller@^3.0.0:
+  integrity sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==
-  version "3.0.0"
+
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+abort-controller@^3.0.0:
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  version "3.0.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-    event-target-shim "^5.0.0"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-
+  dependencies:
-asynckit@^0.4.0:
+    event-target-shim "^5.0.0"
-  version "0.4.0"
+
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+asynckit@^0.4.0:
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  version "0.4.0"
-
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-balanced-match@^1.0.0:
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-  version "1.0.2"
+
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+balanced-match@^1.0.0:
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+  version "1.0.2"
-
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-brace-expansion@^1.1.7:
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-  version "1.1.11"
+
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+brace-expansion@^1.1.7:
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.11"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-    balanced-match "^1.0.0"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-    concat-map "0.0.1"
+  dependencies:
-
+    balanced-match "^1.0.0"
-combined-stream@^1.0.6, combined-stream@^1.0.8:
+    concat-map "0.0.1"
-  version "1.0.8"
+
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+combined-stream@^1.0.6, combined-stream@^1.0.8:
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  version "1.0.8"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-    delayed-stream "~1.0.0"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-
+  dependencies:
-concat-map@0.0.1:
+    delayed-stream "~1.0.0"
-  version "0.0.1"
+
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+concat-map@0.0.1:
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  version "0.0.1"
-
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-delayed-stream@~1.0.0:
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-  version "1.0.0"
+
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+delayed-stream@~1.0.0:
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  version "1.0.0"
-
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-event-target-shim@^5.0.0:
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-  version "5.0.1"
+
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+event-target-shim@^5.0.0:
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+  version "5.0.1"
-
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-events@^3.0.0:
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-  version "3.3.0"
+
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+events@^3.0.0:
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+  version "3.3.0"
-
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-form-data@^2.5.0:
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-  version "2.5.1"
+
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+form-data@^2.5.0:
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  version "2.5.1"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-    asynckit "^0.4.0"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-    combined-stream "^1.0.6"
+  dependencies:
-    mime-types "^2.1.12"
+    asynckit "^0.4.0"
-
+    combined-stream "^1.0.6"
-form-data@^3.0.0:
+    mime-types "^2.1.12"
-  version "3.0.1"
+
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+form-data@^3.0.0:
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  version "3.0.1"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-    asynckit "^0.4.0"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-    combined-stream "^1.0.8"
+  dependencies:
-    mime-types "^2.1.12"
+    asynckit "^0.4.0"
-
+    combined-stream "^1.0.8"
-form-data@^4.0.0:
+    mime-types "^2.1.12"
-  version "4.0.0"
+
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+form-data@^4.0.0:
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  version "4.0.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-    asynckit "^0.4.0"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-    combined-stream "^1.0.8"
+  dependencies:
-    mime-types "^2.1.12"
+    asynckit "^0.4.0"
-
+    combined-stream "^1.0.8"
-ip-regex@^2.1.0:
+    mime-types "^2.1.12"
-  version "2.1.0"
+
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+ip-regex@^2.1.0:
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+  version "2.1.0"
-
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-mime-db@1.52.0:
+  integrity sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==
-  version "1.52.0"
+
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+linux-os-info@^2.0.0:
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+  version "2.0.0"
-
+  resolved "https://registry.yarnpkg.com/linux-os-info/-/linux-os-info-2.0.0.tgz#32a251077c13af1a69dbcb36a168901208e32776"
-mime-types@^2.1.12:
+  integrity sha512-ZopyH4kT2Ehnmix8iUgS/41pfv7fSlUV1JukIn3DB3qD3byvhBNtgCbUApoAtiqcHRLKXCY3zakXlJgiExm2Qg==
-  version "2.1.35"
+
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+lru-cache@^6.0.0:
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  version "6.0.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-    mime-db "1.52.0"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-
+  dependencies:
-minimatch@^3.0.4:
+    yallist "^4.0.0"
-  version "3.1.2"
+
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+macos-release@^3.1.0:
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  version "3.1.0"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.1.0.tgz#6165bb0736ae567ed6649e36ce6a24d87cbb7aca"
-    brace-expansion "^1.1.7"
+  integrity sha512-/M/R0gCDgM+Cv1IuBG1XGdfTFnMEG6PZeT+KGWHO/OG+imqmaD9CH5vHBTycEM3+Kc4uG2Il+tFAuUWLqQOeUA==
-
+
-node-fetch@^2.6.7:
+mime-db@1.52.0:
-  version "2.6.7"
+  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-  dependencies:
+
-    whatwg-url "^5.0.0"
+mime-types@^2.1.12:
-
+  version "2.1.35"
-process@^0.11.10:
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  version "0.11.10"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  dependencies:
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+    mime-db "1.52.0"
-
+
-psl@^1.1.28, psl@^1.1.33:
+minimatch@^3.0.4:
-  version "1.8.0"
+  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-
+  dependencies:
-punycode@^2.1.1:
+    brace-expansion "^1.1.7"
-  version "2.1.1"
+
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+node-fetch@^2.6.7:
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "2.6.9"
-
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-sax@>=0.6.0:
+  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
-  version "1.2.4"
+  dependencies:
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+    whatwg-url "^5.0.0"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
-
+process@^0.11.10:
-semver@^6.1.0, semver@^6.3.0:
+  version "0.11.10"
-  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
-
+psl@^1.1.28:
-tough-cookie@^3.0.1:
+  version "1.9.0"
-  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+
-  dependencies:
+punycode@^2.1.1:
-    ip-regex "^2.1.0"
+  version "2.3.0"
-    psl "^1.1.28"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-    punycode "^2.1.1"
+  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
-
+
-tough-cookie@^4.0.0:
+sax@>=0.6.0:
-  version "4.0.0"
+  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-  dependencies:
+
-    psl "^1.1.33"
+semver@^6.1.0:
-    punycode "^2.1.1"
+  version "6.3.0"
-    universalify "^0.1.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-tr46@~0.0.3:
+
-  version "0.0.3"
+semver@^7.3.7:
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  version "7.3.8"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
-tslib@^1.10.0:
+  dependencies:
-  version "1.14.1"
+    lru-cache "^6.0.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+tough-cookie@^3.0.1:
-
+  version "3.0.1"
-tslib@^2.0.0, tslib@^2.2.0:
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  version "2.3.1"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  dependencies:
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+    ip-regex "^2.1.0"
-
+    psl "^1.1.28"
-tunnel@0.0.6, tunnel@^0.0.6:
+    punycode "^2.1.1"
-  version "0.0.6"
+
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+tr46@~0.0.3:
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+  version "0.0.3"
-
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-universalify@^0.1.2:
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-  version "0.1.2"
+
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+tslib@^1.10.0:
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+  version "1.14.1"
-
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-uuid@^3.3.2, uuid@^3.3.3:
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-  version "3.4.0"
+
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+tslib@^2.2.0:
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+  version "2.5.0"
-
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-uuid@^8.3.0, uuid@^8.3.2:
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-  version "8.3.2"
+
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+tunnel@0.0.6, tunnel@^0.0.6:
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+  version "0.0.6"
-
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-webidl-conversions@^3.0.0:
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-  version "3.0.1"
+
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+uuid@^3.3.2, uuid@^3.3.3:
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  version "3.4.0"
-
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-whatwg-url@^5.0.0:
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-  version "5.0.0"
+
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+uuid@^8.3.0, uuid@^8.3.2:
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  version "8.3.2"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-    tr46 "~0.0.3"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-    webidl-conversions "^3.0.0"
+
-
+webidl-conversions@^3.0.0:
-xml2js@^0.4.19:
+  version "3.0.1"
-  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+
-  dependencies:
+whatwg-url@^5.0.0:
-    sax ">=0.6.0"
+  version "5.0.0"
-    xmlbuilder "~11.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-xmlbuilder@~11.0.0:
+  dependencies:
-  version "11.0.1"
+    tr46 "~0.0.3"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+    webidl-conversions "^3.0.0"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
+xml2js@^0.4.19:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==