Allow bundler: none + bundle-cache: true to use the Bundler shipped with that Ruby + the cache

* This is particularly useful for head builds and is also reasonably
  fast for all supported Rubies.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,21 @@
+---
+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/workflows/test.yml

@@ -8,28 +8,33 @@ on:
     - '*'
     paths-ignore:
     - README.md
-  schedule:
+  workflow_dispatch:
-    - cron: '0 7 * * SUN'
+
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2016, windows-2019 ]
+        os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2019, windows-2022 ]
-        # Use various version syntax here for testing
+        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: [ 2.1, 2.2, 2.3, 2.4, 2.5, 2.6.6, 2.7, ruby-head, debug, jruby-9.1, jruby, jruby-head, truffleruby, truffleruby-head ]
         include:
-        - { os: ubuntu-18.04, ruby: rubinius }
-        - { os: windows-2016, ruby: mingw }
         - { os: windows-2019, ruby: mingw }
         - { os: windows-2019, ruby: mswin }
+        - { os: windows-2022, ruby: mingw }
+        - { os: windows-2022, ruby: ucrt  }
         exclude:
-        - { os: windows-2016, ruby: debug }
+        - { os: windows-2019, ruby: 1.9 }
-        - { os: windows-2016, ruby: truffleruby }
-        - { os: windows-2016, ruby: truffleruby-head }
         - { 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: debug }
+        - { os: windows-2022, ruby: truffleruby }
+        - { os: windows-2022, ruby: truffleruby-head }
+        - { os: windows-2022, ruby: truffleruby+graalvm }
+        - { os: windows-2022, ruby: truffleruby+graalvm-head }
 
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}
@@ -42,8 +47,10 @@ jobs:
         bundler-cache: true
     - run: ruby -v
     - name: PATH
-      shell: bash
+      shell: pwsh
-      run: echo $PATH
+      run: |
+        # Show PATH with Powershell
+        $f, $r = $env:PATH.split([IO.Path]::PathSeparator); $r
 
     - name: build compiler
       run: |
@@ -60,19 +67,29 @@ jobs:
             echo 'ridk is unavailable'
           }
         }
+    - name: RbConfig::CONFIG
+      run: ruby -rrbconfig -rpp -e 'pp RbConfig::CONFIG'
+    - name: RbConfig::MAKEFILE_CONFIG
+      run: ruby -rrbconfig -rpp -e 'pp RbConfig::MAKEFILE_CONFIG'
 
     - name: Subprocess test
       run: ruby test_subprocess.rb
-    - name: OpenSSL version
+    - name: OpenSSL compiled version
+      run: ruby -ropenssl -e 'puts OpenSSL::OPENSSL_VERSION'
+    - name: OpenSSL loaded version
       run: ruby -ropenssl -e 'puts OpenSSL::OPENSSL_LIBRARY_VERSION'
+      if: matrix.ruby != '1.9'
     - name: OpenSSL test
       run: ruby -ropen-uri -e 'puts URI.send(:open, %{https://rubygems.org/}) { |f| f.read(1024) }'
 
+    - run: gem env
     - name: C extension test
-      run: gem install json:2.2.0 --no-document
+      run: gem install json -v 2.2.0
     - run: bundle --version
+    # This step is redundant with `bundler-cache: true` but is there to check a redundant `bundle install` still works
     - run: bundle install
     - run: bundle exec rake --version
+    - run: bundle exec rake
 
     - name: which ruby, rake
       if: "!startsWith(matrix.os, 'windows')"
@@ -93,10 +110,98 @@ jobs:
       run: echo ~
     - name: Windows JRuby
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.ruby, 'jruby')
-      run: gem install sassc -N
+      run: gem install sassc
+
+  testLatestRubygemsVersion:
+    name: "Test rubygems input set to latest upgrades the default RubyGems version"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./
+      with:
+        ruby-version: 2.6
+        rubygems: latest
+    - run: ruby -e "exit(Gem.rubygems_version > Gem::Version.new('3.0.3'))"
+
+  testFixedRubygemsVersionUpgrades:
+    name: "Test rubygems input set to a fixed version upgrades RubyGems to that version if the default is older"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./
+      with:
+        ruby-version: 2.6
+        rubygems: 3.2.3
+    - run: gem --version | grep -F "3.2.3"
+
+  testFixedRubygemsVersionNoop:
+    name: "Test rubygems input set to a fixed version noops if the default is newer"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./
+      with:
+        ruby-version: 3.1
+        rubygems: 3.2.3
+    - run: gem --version | grep -F "3.3.3"
+
+  testExactBundlerVersion:
+    name: "Test with an exact Bundler version"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./
+      with:
+        ruby-version: 2.6
+        bundler: 2.2.3
+    - run: bundle --version | grep -F "Bundler version 2.2.3"
+
+  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: ./
+        with:
+          ruby-version: 2.7
+          bundler: 1
+          bundler-cache: true
+      - run: bundle --version | grep -F "Bundler version 1."
+
+  testGemfileMatrix:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [ rails5, rails6 ]
+    name: "Test with ${{ matrix.gemfile }} gemfile"
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        with:
+          ruby-version: 2.6
+          bundler-cache: true
+      - run: bundle exec rails --version
+
+  testTruffleRubyNokogiri:
+    name: "Test installing a Gemfile with nokogiri on TruffleRuby"
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/nokogiri.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        with:
+          ruby-version: truffleruby-head
+          bundler-cache: true
+      - run: bundle list | grep nokogiri
 
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - run: yarn install

CONTRIBUTING.md

@@ -19,3 +19,9 @@ It is recommended to add this as a `git` `pre-commit` hook:
 ```bash
 $ cp pre-commit .git/hooks/pre-commit
 ```
+
+## Adding a new Ruby version
+
+Add the new version in `ruby-builder-versions.json`,
+then follow the steps above in [Regenerating dist/index.js](#regenerating-distindexjs) to update `dist/index.js`.
+Finally, update the "Supported Versions" section of the README if needed.

README.md

@@ -14,21 +14,24 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| Ruby | 2.1.9, 2.2, 2.3.0 - 2.3.8, 2.4.0 - 2.4.10, 2.5.0 - 2.5.8, 2.6.0 - 2.6.6, 2.7.2, head, debug, mingw, mswin |
+| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.1.0, head, debug, mingw, mswin |
-| JRuby | 9.1.17.0, 9.2.9.0 - 9.2.13.0, head |
+| `jruby` | 9.1.17.0 - 9.3.3.0, head |
-| TruffleRuby | 19.3.0 - 20.2.0, head |
+| `truffleruby` | 19.3.0 - 22.0.0, head |
-| Rubinius | 4.14 |
+| `truffleruby+graalvm` | 21.2.0 - 22.0.0, 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.
 
+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.
 Due to that, Ruby 2.2 resolves to 2.2.6 on Windows and 2.2.10 on other platforms.
 And Ruby 2.3 on Windows only has builds for 2.3.0, 2.3.1 and 2.3.3.
 
-Note that Ruby ≤ 2.3 and the OpenSSL version it needs (1.0.2) are both end-of-life,
+Note that Ruby ≤ 2.4 and the OpenSSL version it needs (1.0.2) are both end-of-life,
-which means Ruby ≤ 2.3 is unmaintained and considered insecure.
+which means Ruby ≤ 2.4 is unmaintained and considered insecure.
-On Windows, Ruby 2.4 uses OpenSSL 1.0.2, which is no longer maintained.
 
 ### Supported Platforms
 
@@ -36,20 +39,19 @@ The action works for all [GitHub-hosted runners](https://help.github.com/en/acti
 
 | Operating System | Recommended | Other Supported Versions |
 | ----------- | -------- | -------- |
-| Ubuntu  | `ubuntu-latest`  (= `ubuntu-18.04`) | `ubuntu-20.04`, `ubuntu-16.04` |
+| Ubuntu  | `ubuntu-latest`  (= `ubuntu-20.04`) | `ubuntu-18.04`, `ubuntu-16.04` |
-| macOS   | `macos-latest`   (= `macos-10.15`)  | |
+| macOS   | `macos-latest`   (= `macos-10.15`)  | `macos-11.0` |
-| Windows | `windows-latest` (= `windows-2019`) | `windows-2016` |
+| Windows | `windows-latest` (= `windows-2019`) | `windows-2022` |
-
-Rubinius is only available on `ubuntu-18.04`.
 
 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).
 `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)
+`jruby-head` is generated by [jruby-dev-builder](https://github.com/ruby/jruby-dev-builder),
-and `truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder).
+`truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder)
-The full list of available Ruby versions can be seen in [ruby-builder-versions.js](ruby-builder-versions.js)
+and `truffleruby+graalvm` is generated by [graalvm-ce-dev-builds](https://github.com/graalvm/graalvm-ce-dev-builds).
-for Ubuntu and macOS and in [windows-versions.js](windows-versions.js) for Windows.
+The full list of available Ruby versions can be seen in [ruby-builder-versions.json](ruby-builder-versions.json)
+for Ubuntu and macOS and in [windows-versions.json](windows-versions.json) for Windows.
 
 ## Usage
 
@@ -57,7 +59,7 @@ for Ubuntu and macOS and in [windows-versions.js](windows-versions.js) for Windo
 
 ```yaml
 name: My workflow
-on: [push]
+on: [push, pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -66,35 +68,58 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.6 # Not needed with a .ruby-version file
-    - run: bundle install
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - run: bundle exec rake
 ```
 
-### Matrix
+### Matrix of Ruby Versions
 
 This matrix tests all stable releases and `head` versions of MRI, JRuby and TruffleRuby on Ubuntu and macOS.
 
 ```yaml
 name: My workflow
-on: [push]
+on: [push, pull_request]
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos]
+        os: [ubuntu-latest, macos-latest]
-        ruby: [2.5, 2.6, 2.7, head, debug, jruby, jruby-head, truffleruby, truffleruby-head]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-    runs-on: ${{ matrix.os }}-latest
+        ruby: [2.6, 2.7, '3.0', 3.1, head, jruby, jruby-head, truffleruby, truffleruby-head]
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - run: bundle install
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - run: bundle exec rake
 ```
 
+### Matrix of Gemfiles
+
+```yaml
+name: My workflow
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [ rails5, rails6 ]
+    runs-on: ubuntu-latest
+    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: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake
+```
+
 See the GitHub Actions documentation for more details about the
 [workflow syntax](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions)
 and the [condition and expression syntax](https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions).
@@ -114,13 +139,25 @@ and the [condition and expression syntax](https://help.github.com/en/actions/ref
 The `working-directory` input can be set to resolve `.ruby-version`, `.tool-versions` and `Gemfile.lock`
 if they are not at the root of the repository, see [action.yml](action.yml) for details.
 
+### RubyGems
+
+By default, the default RubyGems version that comes with each Ruby is used.
+However, users can optionally customize the RubyGems version that they want by
+setting the `rubygems` input.
+
+See [action.yml](action.yml) for more details about the `rubygems` input.
+
+If you're running into `ArgumentError: wrong number of arguments (given 4,
+expected 1)` errors with a stacktrace including Psych and RubyGems entries, you
+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,
-the latest version of Bundler with the same major version will be installed.
+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).
 
-This behavior can be customized, see [action.yml](action.yml) for details about the `bundler` input.
+This behavior can be customized, see [action.yml](action.yml) for more details about the `bundler` input.
 
 ### Caching `bundle install` automatically
 
@@ -131,47 +168,58 @@ This action provides a way to automatically run `bundle install` and cache the r
         bundler-cache: true
 ```
 
+Note that any step doing `bundle install` (for the root `Gemfile`) or `gem install bundler` can be removed with `bundler-cache: true`.
+
 This caching speeds up installing gems significantly and avoids too many requests to RubyGems.org.  
 It needs a `Gemfile` (or `$BUNDLE_GEMFILE` or `gems.rb`) under the [`working-directory`](#working-directory).  
 If there is a `Gemfile.lock` (or `$BUNDLE_GEMFILE.lock` or `gems.locked`), `bundle config --local deployment true` is used.
 
-To perform caching, this action will use `bundle config --local path vendor/bundle`.  
+To use a `Gemfile` which is not at the root or has a different name, set `BUNDLE_GEMFILE` in the `env` at the job level
-Therefore, the Bundler `path` should not be changed in your workflow for the cache to work.
+as shown in the [example](#matrix-of-gemfiles).
 
-### Caching `bundle install` manually
+#### bundle config
 
-You can also cache gems manually,
+When using `bundler-cache: true` you might notice there is no good place to run `bundle config ...` commands.
-but this is not recommended because it is verbose and very difficult to use a correct cache key.
+These can be replaced by `BUNDLE_*` environment variables, which are also faster.
-You can cache the installed gems with these two steps:
+They should be set in the `env` at the job level as shown in the [example](#matrix-of-gemfiles).
+To find the correct the environment variable name, see the [Bundler docs](https://bundler.io/man/bundle-config.1.html) or look at `.bundle/config` after running `bundle config --local KEY VALUE` locally.
+You might need to `"`-quote the environment variable name in YAML if it has unusual characters like `/`.
+
+To perform caching, this action will use `bundle config --local path $PWD/vendor/bundle`.  
+Therefore, the Bundler `path` should not be changed in your workflow for the cache to work (no `bundle config path`).
+
+#### How it Works
+
+When there is no lockfile, one is generated with `bundle lock`, which is the same as `bundle install` would do first before actually fetching any gem.
+In other words, it works exactly like `bundle install`.
+The hash of the generated lockfile is then used for caching, which is the only correct approach.
+
+#### Dealing with a corrupted cache
+
+In some rare scenarios (like using gems with C extensions whose functionality depends on libraries found on the system
+at the time of the gem's build) it may be necessary to ignore contents of the cache and get and build all the gems anew.
+In order to achieve this, set the `cache-version` option to any value other than `0` (or change it to a new unique value
+if you have already used it before.)
 
 ```yaml
-    - uses: actions/cache@v2
+    - uses: ruby/setup-ruby@v1
       with:
-        path: vendor/bundle
+        bundler-cache: true
-        key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
+        cache-version: 1
-        restore-keys: |
-          bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-
-    - name: bundle install
-      run: |
-        bundle config deployment true
-        bundle config path vendor/bundle
-        bundle install --jobs 4
 ```
 
-When using a single OS, replace `${{ matrix.os }}` with the OS.  
+#### Caching `bundle install` manually
-When using a single job with a Ruby version, replace `${{ matrix.ruby }}` with the Ruby version.  
-When using `.ruby-version`, replace `${{ matrix.ruby }}` with `${{ hashFiles('.ruby-version') }}`.  
-When using `.tool-versions`, replace `${{ matrix.ruby }}` with `${{ hashFiles('.tool-versions') }}`.
 
-This uses the [cache action](https://github.com/actions/cache).
+It is also possible to cache gems manually, but this is not recommended because it is verbose and *very difficult* to do correctly.
-The code above is a more complete version of the [Ruby - Bundler example](https://github.com/actions/cache/blob/master/examples.md#ruby---bundler).
+There are many concerns which means using `actions/cache` is never enough for caching gems (e.g., incomplete cache key, cleaning old gems when restoring from another key, correctly hashing the lockfile if not checked in, OS versions, ABI compatibility for `ruby-head`, etc).
-Make sure to include `use-ruby` in the `key` to avoid conflicting with previous caches.
+So, please use `bundler-cache: true` instead and report any issue.
 
 ## Windows
 
 Note that running CI on Windows can be quite challenging if you are not very familiar with Windows.
 It is recommended to first get your build working on Ubuntu and macOS before trying Windows.
 
+* Use Bundler 2.2.18+ on Windows (older versions have [bugs](https://github.com/ruby/setup-ruby/issues/209#issuecomment-889064123)) by not setting the `bundler:` input and ensuring there is no `BUNDLED WITH 1.x.y` in a checked-in `Gemfile.lock`.
 * The default shell on Windows is not Bash but [PowerShell](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#using-a-specific-shell).
   This can lead issues such as multi-line scripts [not working as expected](https://github.com/ruby/setup-ruby/issues/13).
 * The `PATH` contains [multiple compiler toolchains](https://github.com/ruby/setup-ruby/issues/19). Use `where.exe` to debug which tool is used.
@@ -197,12 +245,18 @@ This action might work with [self-hosted runners](https://docs.github.com/en/act
 if the [virtual environment](https://github.com/actions/virtual-environments) 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` installed
-* The runner software is running as user `runner` with a home directory of `/home/runner`, or you have created a symlink for the home directory of whatever user that the runner is running as to `/home/runner`.
+* The default tool cache directory (`/opt/hostedtoolcache` on Linux, `/Users/runner/hostedtoolcache` on macOS,
+  `C:/hostedtoolcache/windows` on Windows) must be writable by the `runner` user.
+  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.
 
+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)).
+
 ## History
 
 This action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization.

Rakefile

@@ -0,0 +1,3 @@
+task :default do
+  puts "Hello World from Rake"
+end

action.yml

@@ -9,9 +9,16 @@ inputs:
     description: 'Engine and version to use, see the syntax in the README. Reads from .ruby-version or .tool-versions if unset.'
     required: false
     default: 'default'
+  rubygems:
+    description: |
+      The version of RubyGems to use. Either 'default', 'latest', or a version number (e.g., 3.3.5).
+      For 'default', no action is taken and the version of RubyGems that comes with Ruby by default is used.
+      For 'latest', `gem update --system` is run to update to the latest RubyGems version.
+      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.
+      Defaults to 'default'.
   bundler:
     description: |
-      The version of Bundler to install. Either 'none', 1, 2, 'latest' or 'Gemfile.lock'.
+      The version of Bundler to install. Either 'none', 'latest', 'Gemfile.lock', or a version number (e.g., 1, 2, 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.
       Defaults to 'Gemfile.lock' if the file exists and 'latest' otherwise.
     required: false
@@ -24,6 +31,12 @@ inputs:
     description: 'The working directory to use for resolving paths for .ruby-version, .tool-versions and Gemfile.lock.'
     required: false
     default: '.'
+  cache-version:
+    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.
+    required: false
+    default: '0'
 outputs:
   ruby-prefix:
     description: 'The prefix of the installed ruby'

bundler.js

@@ -0,0 +1,207 @@
+const fs = require('fs')
+const path = require('path')
+const core = require('@actions/core')
+const exec = require('@actions/exec')
+const cache = require('@actions/cache')
+const common = require('./common')
+
+export const DEFAULT_CACHE_VERSION = '0'
+
+// The returned gemfile is guaranteed to exist, the lockfile might not exist
+export function detectGemfiles() {
+  const gemfilePath = process.env['BUNDLE_GEMFILE'] || 'Gemfile'
+  if (fs.existsSync(gemfilePath)) {
+    return [gemfilePath, `${gemfilePath}.lock`]
+  } else if (process.env['BUNDLE_GEMFILE']) {
+    throw new Error(`$BUNDLE_GEMFILE is set to ${gemfilePath} but does not exist`)
+  }
+
+  if (fs.existsSync("gems.rb")) {
+    return ["gems.rb", "gems.locked"]
+  }
+
+  return [null, null]
+}
+
+function readBundledWithFromGemfileLock(lockFile) {
+  if (lockFile !== null && fs.existsSync(lockFile)) {
+    const contents = fs.readFileSync(lockFile, 'utf8')
+    const lines = contents.split(/\r?\n/)
+    const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
+    if (bundledWithLine !== -1) {
+      const nextLine = lines[bundledWithLine+1]
+      if (nextLine && /^\d+/.test(nextLine.trim())) {
+        const bundlerVersion = nextLine.trim()
+        console.log(`Using Bundler ${bundlerVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
+        return bundlerVersion
+      }
+    }
+  }
+  return null
+}
+
+async function afterLockFile(lockFile, platform, engine, rubyVersion) {
+  if (engine.startsWith('truffleruby') && common.floatVersion(rubyVersion) < 21.1 && platform.startsWith('ubuntu-')) {
+    const contents = fs.readFileSync(lockFile, 'utf8')
+    if (contents.includes('nokogiri')) {
+      await common.measure('Installing libxml2-dev libxslt-dev, required to install nokogiri on TruffleRuby < 21.1', async () =>
+        exec.exec('sudo', ['apt-get', '-yqq', 'install', 'libxml2-dev', 'libxslt-dev'], { silent: true }))
+    }
+  }
+}
+
+export async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefix, engine, rubyVersion) {
+  let bundlerVersion = bundlerVersionInput
+
+  if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
+    bundlerVersion = readBundledWithFromGemfileLock(lockFile)
+
+    if (!bundlerVersion) {
+      bundlerVersion = 'latest'
+    }
+  }
+
+  if (bundlerVersion === 'latest') {
+    bundlerVersion = '2'
+  }
+
+  if (/^\d+/.test(bundlerVersion)) {
+    // OK
+  } else {
+    throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
+  }
+
+  if (engine === 'ruby' && common.floatVersion(rubyVersion) <= 2.2) {
+    console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
+    bundlerVersion = '1'
+  } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
+    console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1')
+    bundlerVersion = '1'
+  } else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same
+    console.log('JRuby 9.1 has a bug with Bundler 2 (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1')
+    bundlerVersion = '1'
+  }
+
+  if (common.isHeadVersion(rubyVersion) && common.isBundler2Default(engine, rubyVersion) && bundlerVersion.startsWith('2')) {
+    // Avoid installing a newer Bundler version for head versions as it might not work.
+    // For releases, even if they ship with Bundler 2 we install the latest Bundler.
+    console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
+  } else if (engine.startsWith('truffleruby') && common.isBundler1Default(engine, rubyVersion) && bundlerVersion.startsWith('1')) {
+    console.log(`Using Bundler 1 shipped with ${engine}-${rubyVersion}`)
+  } else {
+    const gem = path.join(rubyPrefix, 'bin', 'gem')
+    const bundlerVersionConstraint = /^\d+\.\d+\.\d+/.test(bundlerVersion) ? bundlerVersion : `~> ${bundlerVersion}`
+    // Workaround for https://github.com/rubygems/rubygems/issues/5245
+    const force = (platform.startsWith('windows-') && engine === 'ruby' && common.floatVersion(rubyVersion) >= 3.1) ? ['--force'] : []
+    await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint])
+  }
+
+  return bundlerVersion
+}
+
+export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, bundlerVersion, cacheVersion) {
+  if (gemfile === null) {
+    console.log('Could not determine gemfile path, skipping "bundle install" and caching')
+    return false
+  }
+
+  let envOptions = {}
+  if (bundlerVersion.startsWith('1') && common.isBundler2Default(engine, rubyVersion)) {
+    // If Bundler 1 is specified on Rubies which ship with Bundler 2,
+    // we need to specify which Bundler version to use explicitly until the lockfile exists.
+    console.log(`Setting BUNDLER_VERSION=${bundlerVersion} for "bundle config|lock" commands below to ensure Bundler 1 is used`)
+    envOptions = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
+  }
+
+  // config
+  const cachePath = 'vendor/bundle'
+  // An absolute path, so it is reliably under $PWD/vendor/bundle, and not relative to the gemfile's directory
+  const bundleCachePath = path.join(process.cwd(), cachePath)
+
+  await exec.exec('bundle', ['config', '--local', 'path', bundleCachePath], envOptions)
+
+  if (fs.existsSync(lockFile)) {
+    await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], envOptions)
+  } else {
+    // Generate the lockfile so we can use it to compute the cache key.
+    // This will also automatically pick up the latest gem versions compatible with the Gemfile.
+    await exec.exec('bundle', ['lock'], envOptions)
+  }
+
+  await afterLockFile(lockFile, platform, engine, rubyVersion)
+
+  // cache key
+  const paths = [cachePath]
+  const baseKey = await computeBaseKey(platform, engine, rubyVersion, lockFile, cacheVersion)
+  const key = `${baseKey}-${await common.hashFile(lockFile)}`
+  // If only Gemfile.lock changes we can reuse part of the cache, and clean old gem versions below
+  const restoreKeys = [`${baseKey}-`]
+  console.log(`Cache key: ${key}`)
+
+  // restore cache & install
+  let cachedKey = null
+  try {
+    cachedKey = await cache.restoreCache(paths, key, restoreKeys)
+  } catch (error) {
+    if (error.name === cache.ValidationError.name) {
+      throw error;
+    } else {
+      core.info(`[warning] There was an error restoring the cache ${error.message}`)
+    }
+  }
+
+  if (cachedKey) {
+    console.log(`Found cache for key: ${cachedKey}`)
+  }
+
+  // Always run 'bundle install' to list the gems
+  await exec.exec('bundle', ['install', '--jobs', '4'])
+
+  // @actions/cache only allows to save for non-existing keys
+  if (cachedKey !== key) {
+    if (cachedKey) { // existing cache but Gemfile.lock differs, clean old gems
+      await exec.exec('bundle', ['clean'])
+    }
+
+    // Error handling from https://github.com/actions/cache/blob/master/src/save.ts
+    console.log('Saving cache')
+    try {
+      await cache.saveCache(paths, key)
+    } catch (error) {
+      if (error.name === cache.ValidationError.name) {
+        throw error;
+      } else if (error.name === cache.ReserveCacheError.name) {
+        core.info(error.message);
+      } else {
+        core.info(`[warning]${error.message}`)
+      }
+    }
+  }
+
+  return true
+}
+
+async function computeBaseKey(platform, engine, version, lockFile, cacheVersion) {
+  const cacheVersionSuffix = DEFAULT_CACHE_VERSION === cacheVersion ? '' : `-cachever:${cacheVersion}`
+  let key = `setup-ruby-bundler-cache-v3-${platform}-${engine}-${version}${cacheVersionSuffix}`
+
+  if (common.isHeadVersion(version)) {
+    if (engine !== 'jruby') {
+      // CRuby dev versions do not change the ABI version when the ABI changes, so use the commit as the ABI version
+      let print_abi = engine === 'ruby' ? 'print RUBY_REVISION' : "print RbConfig::CONFIG['ruby_version']"
+      let abi = ''
+      await exec.exec('ruby', ['-e', print_abi], {
+        silent: true,
+        listeners: {
+          stdout: (data) => {
+            abi += data.toString();
+          }
+        }
+      });
+      key += `-ABI-${abi}`
+    }
+  }
+
+  key += `-${lockFile}`
+  return key
+}

common.js

@@ -11,8 +11,18 @@ 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 function partition(string, separator) {
+  const i = string.indexOf(separator)
+  if (i === -1) {
+    throw new Error(`No separator ${separator} in string ${string}`)
+  }
+  return [string.slice(0, i), string.slice(i + separator.length, string.length)]
+}
+
+let inGroup = false
+
 export async function measure(name, block) {
-  return await core.group(name, async () => {
+  const body = async () => {
     const start = performance.now()
     try {
       return await block()
@@ -21,11 +31,55 @@ export async function measure(name, block) {
       const duration = (end - start) / 1000.0
       console.log(`Took ${duration.toFixed(2).padStart(6)} seconds`)
     }
-  })
+  }
+
+  if (inGroup) {
+    // Nested groups are not yet supported on GitHub Actions
+    console.log(`> ${name}`)
+    return await body()
+  } else {
+    inGroup = true
+    try {
+      return await core.group(name, body)
+    } finally {
+      inGroup = false
+    }
+  }
 }
 
 export function isHeadVersion(rubyVersion) {
-  return rubyVersion === 'head' || rubyVersion === 'debug' || rubyVersion === 'mingw' || rubyVersion === 'mswin'
+  return ['head', 'debug',  'mingw', 'mswin', 'ucrt'].includes(rubyVersion)
+}
+
+export function isStableVersion(rubyVersion) {
+  return /^\d+(\.\d+)*$/.test(rubyVersion)
+}
+
+export function isBundler1Default(engine, rubyVersion) {
+  return !isBundler2Default(engine, rubyVersion)
+}
+
+export function isBundler2Default(engine, rubyVersion) {
+  if (engine === 'ruby') {
+    return floatVersion(rubyVersion) >= 2.7
+  } else if (engine.startsWith('truffleruby')) {
+    return floatVersion(rubyVersion) >= 21.0
+  } else if (engine === 'jruby') {
+    return floatVersion(rubyVersion) >= 9.3
+  } else {
+    return false
+  }
+}
+
+export function floatVersion(rubyVersion) {
+  const match = rubyVersion.match(/^\d+\.\d+/)
+  if (match) {
+    return parseFloat(match[0])
+  } else if (isHeadVersion(rubyVersion)) {
+    return 999.999
+  } else {
+    throw new Error(`Could not convert version ${rubyVersion} to a float`)
+  }
 }
 
 export async function hashFile(file) {
@@ -36,64 +90,115 @@ export async function hashFile(file) {
   return hash.digest('hex')
 }
 
+function getImageOS() {
+  const imageOS = process.env['ImageOS']
+  if (!imageOS) {
+    throw new Error('The environment variable ImageOS must be set')
+  }
+  return imageOS
+}
+
 export function getVirtualEnvironmentName() {
-  const platform = os.platform()
+  const imageOS = getImageOS()
-  if (platform === 'linux') {
+
-    return `ubuntu-${findUbuntuVersion()}`
+  let match = imageOS.match(/^ubuntu(\d+)/) // e.g. ubuntu18
-  } else if (platform === 'darwin') {
+  if (match) {
-    return 'macos-latest'
+    return `ubuntu-${match[1]}.04`
-  } else if (platform === 'win32') {
+  }
-    return 'windows-latest'
+
+  match = imageOS.match(/^macos(\d{2})(\d+)?/) // e.g. macos1015, macos11
+  if (match) {
+    return `macos-${match[1]}.${match[2] || '0'}`
+  }
+
+  match = imageOS.match(/^win(\d+)/) // e.g. win19
+  if (match) {
+    return `windows-20${match[1]}`
+  }
+
+  throw new Error(`Unknown ImageOS ${imageOS}`)
+}
+
+export function shouldUseToolCache(engine, version) {
+  return engine === 'ruby' && !isHeadVersion(version)
+}
+
+function getPlatformToolCache(platform) {
+  // Hardcode paths rather than using $RUNNER_TOOL_CACHE because the prebuilt Rubies cannot be moved anyway
+  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'
   } else {
-    throw new Error(`Unknown platform ${platform}`)
+    throw new Error('Unknown platform')
   }
 }
 
-function findUbuntuVersion() {
+export function getToolCacheRubyPrefix(platform, version) {
-  const lsb_release = fs.readFileSync('/etc/lsb-release', 'utf8')
+  const toolCache = getPlatformToolCache(platform)
-  const match = lsb_release.match(/^DISTRIB_RELEASE=(\d+\.\d+)$/m)
+  return path.join(toolCache, 'Ruby', version, 'x64')
-  if (match) {
+}
-    return match[1]
+
-  } else {
+export function createToolCacheCompleteFile(toolCacheRubyPrefix) {
-    throw new Error('Could not find Ubuntu version')
+  const completeFile = `${toolCacheRubyPrefix}.complete`
-  }
+  fs.writeFileSync(completeFile, '')
 }
 
 // convert windows path like C:\Users\runneradmin to /c/Users/runneradmin
 export function win2nix(path) {
   if (/^[A-Z]:/i.test(path)) {
     // path starts with drive
-    path = `/${path[0].toLowerCase()}${path.split(':', 2)[1]}`
+    path = `/${path[0].toLowerCase()}${partition(path, ':')[1]}`
   }
   return path.replace(/\\/g, '/').replace(/ /g, '\\ ')
 }
 
+// JRuby is installed after setupPath is called, so folder doesn't exist
+function rubyIsUCRT(path) {
+  return !!(fs.existsSync(path) &&
+    fs.readdirSync(path, { withFileTypes: true }).find(dirent =>
+      dirent.isFile() && dirent.name.match(/^x64-ucrt-ruby\d{3}\.dll$/)))
+}
+
 export function setupPath(newPathEntries) {
+  let msys2Type = null
   const envPath = windows ? 'Path' : 'PATH'
   const originalPath = process.env[envPath].split(path.delimiter)
   let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
+  core.startGroup(`Modifying ${envPath}`)
+
   // First remove the conflicting path entries
   if (cleanPath.length !== originalPath.length) {
-    core.startGroup(`Cleaning ${envPath}`)
+    console.log(`Entries removed from ${envPath} to avoid conflicts with default Ruby:`)
-    console.log(`Entries removed from ${envPath} to avoid conflicts with Ruby:`)
     for (const entry of originalPath) {
       if (!cleanPath.includes(entry)) {
         console.log(`  ${entry}`)
       }
     }
     core.exportVariable(envPath, cleanPath.join(path.delimiter))
-    core.endGroup()
   }
 
   // Then add new path entries using core.addPath()
   let newPath
   if (windows) {
+    // main Ruby dll determines whether mingw or ucrt build
+    msys2Type = rubyIsUCRT(newPathEntries[0]) ? 'ucrt64' : 'mingw64'
+
     // add MSYS2 in path for all Rubies on Windows, as it provides a better bash shell and a native toolchain
-    const msys2 = ['C:\\msys64\\mingw64\\bin', 'C:\\msys64\\usr\\bin']
+    const msys2 = [`C:\\msys64\\${msys2Type}\\bin`, 'C:\\msys64\\usr\\bin']
     newPath = [...newPathEntries, ...msys2]
   } else {
     newPath = newPathEntries
   }
+  console.log(`Entries added to ${envPath} to use selected Ruby:`)
+  for (const entry of newPath) {
+    console.log(`  ${entry}`)
+  }
+  core.endGroup()
+
   core.addPath(newPath.join(path.delimiter))
+  return msys2Type
 }

gemfiles/bundler1.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "bundler", "~> 1.0"

gemfiles/nokogiri.gemfile

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

gemfiles/rails5.gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"

gemfiles/rails6.gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"

generate-windows-versions.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'yaml'
 require 'json'
 
-min_requirements = ['~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) }
+min_requirements = ['~> 2.0.0', '~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) }
 
 url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
 entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true)
@@ -28,6 +28,7 @@ versions = entries.select { |entry|
 versions['head'] = 'https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z'
 versions['mingw'] = 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z'
 versions['mswin'] = 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z'
+versions['ucrt'] = 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-ucrt.7z'
+
+File.binwrite 'windows-versions.json', "#{JSON.pretty_generate(versions)}\n"
 
-js = "export const versions = #{JSON.pretty_generate(versions)}\n"
-File.write 'windows-versions.js', js

index.js

@@ -3,16 +3,19 @@ const fs = require('fs')
 const path = require('path')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
-const cache = require('@actions/cache')
 const common = require('./common')
+const rubygems = require('./rubygems')
+const bundler = require('./bundler')
 
 const windows = common.windows
 
 const inputDefaults = {
   'ruby-version': 'default',
+  'rubygems': 'default',
   'bundler': 'default',
   'bundler-cache': 'true',
   'working-directory': '.',
+  'cache-version': bundler.DEFAULT_CACHE_VERSION,
 }
 
 // entry point when this action is run on its own
@@ -39,7 +42,7 @@ export async function setupRuby(options = {}) {
   const [engine, parsedVersion] = parseRubyEngineAndVersion(inputs['ruby-version'])
 
   let installer
-  if (platform === 'windows-latest' && engine !== 'jruby') {
+  if (platform.startsWith('windows-') && engine !== 'jruby') {
     installer = require('./windows')
   } else {
     installer = require('./ruby-builder')
@@ -48,11 +51,26 @@ export async function setupRuby(options = {}) {
   const engineVersions = installer.getAvailableVersions(platform, engine)
   const version = validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVersion)
 
-  createGemRC()
+  createGemRC(engine, version)
   envPreInstall()
 
+  // 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') && 
+    !fs.existsSync('C:\\msys64\\mingw64\\bin\\gcc.exe')) {
+    await require('./windows').installJRubyTools()
+  }
+
   const rubyPrefix = await installer.install(platform, engine, version)
 
+  await common.measure('Print Ruby version', async () =>
+    await exec.exec('ruby', ['--version']))
+
+  if (inputs['rubygems'] !== 'default') {
+    await common.measure('Updating RubyGems', async () =>
+      rubygems.rubygemsUpdate(inputs['rubygems'], rubyPrefix))
+  }
+
   // When setup-ruby is used by other actions, this allows code in them to run
   // before 'bundle install'.  Installed dependencies may require additional
   // libraries & headers, build tools, etc.
@@ -60,45 +78,22 @@ export async function setupRuby(options = {}) {
     await inputs['afterSetupPathHook']({ platform, rubyPrefix, engine, version })
   }
 
+  const [gemfile, lockFile] = bundler.detectGemfiles()
+  let bundlerVersion = "unknown"
+
   if (inputs['bundler'] !== 'none') {
-    const [gemfile, lockFile] = detectGemfiles()
+    bundlerVersion = await common.measure('Installing Bundler', async () =>
+      bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
+  }
 
-    await common.measure('Installing Bundler', async () =>
+  if (inputs['bundler-cache'] === 'true') {
-      installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
+    await common.measure('bundle install', async () =>
-
+      bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
-    if (inputs['bundler-cache'] === 'true') {
-      await common.measure('bundle install', async () =>
-          bundleInstall(gemfile, lockFile, platform, engine, version))
-    }
   }
 
   core.setOutput('ruby-prefix', rubyPrefix)
 }
 
-function detectGemfiles() {
-  const gemfilePath = process.env['BUNDLE_GEMFILE'] || 'Gemfile'
-  if (fs.existsSync(gemfilePath)) {
-    const lockPath = `${gemfilePath}.lock`
-    if (fs.existsSync(lockPath)) {
-      return [gemfilePath, lockPath]
-    } else {
-      return [gemfilePath, null]
-    }
-  }
-
-  const gemsRbPath = "gems.rb"
-  if (fs.existsSync(gemsRbPath)) {
-    const lockPath = "gems.locked"
-    if (fs.existsSync(lockPath)) {
-      return [gemsRbPath, lockPath]
-    } else {
-      return [gemsRbPath, null]
-    }
-  }
-
-  return [null, null]
-}
-
 function parseRubyEngineAndVersion(rubyVersion) {
   if (rubyVersion === 'default') {
     if (fs.existsSync('.ruby-version')) {
@@ -115,20 +110,20 @@ function parseRubyEngineAndVersion(rubyVersion) {
     console.log(`Using ${rubyVersion} as input from file .ruby-version`)
   } else if (rubyVersion === '.tool-versions') { // Read from .tool-versions
     const toolVersions = fs.readFileSync('.tool-versions', 'utf8').trim()
-    const rubyLine = toolVersions.split(/\r?\n/).filter(e => e.match(/^ruby\s/))[0]
+    const rubyLine = toolVersions.split(/\r?\n/).filter(e => /^ruby\s/.test(e))[0]
-    rubyVersion = rubyLine.split(/\s+/, 2)[1]
+    rubyVersion = rubyLine.match(/^ruby\s+(.+)$/)[1]
     console.log(`Using ${rubyVersion} as input from file .tool-versions`)
   }
 
   let engine, version
-  if (rubyVersion.match(/^(\d+)/) || common.isHeadVersion(rubyVersion)) { // X.Y.Z => ruby-X.Y.Z
+  if (/^(\d+)/.test(rubyVersion) || common.isHeadVersion(rubyVersion)) { // X.Y.Z => ruby-X.Y.Z
     engine = 'ruby'
     version = rubyVersion
   } else if (!rubyVersion.includes('-')) { // myruby -> myruby-stableVersion
     engine = rubyVersion
-    version = '' // Let the logic below find the version
+    version = '' // Let the logic in validateRubyEngineAndVersion() find the version
   } else { // engine-X.Y.Z
-    [engine, version] = rubyVersion.split('-', 2)
+    [engine, version] = common.partition(rubyVersion, '-')
   }
 
   return [engine, version]
@@ -142,12 +137,19 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
   let version = parsedVersion
   if (!engineVersions.includes(parsedVersion)) {
     const latestToFirstVersion = engineVersions.slice().reverse()
-    const found = latestToFirstVersion.find(v => !common.isHeadVersion(v) && v.startsWith(parsedVersion))
+    // 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))
+    if (!found) {
+      // Exclude head versions, they must be exact matches
+      found = latestToFirstVersion.find(v => !common.isHeadVersion(v) && v.startsWith(parsedVersion))
+    }
+
     if (found) {
       version = found
     } 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
         File an issue at https://github.com/ruby/setup-ruby/issues if would like support for a new version`)
     }
   }
@@ -155,10 +157,14 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, parsedVe
   return version
 }
 
-function createGemRC() {
+function createGemRC(engine, version) {
   const gemrc = path.join(os.homedir(), '.gemrc')
   if (!fs.existsSync(gemrc)) {
-    fs.writeFileSync(gemrc, `gem: --no-document${os.EOL}`)
+    if (engine === 'ruby' && common.floatVersion(version) < 2.0) {
+      fs.writeFileSync(gemrc, `install: --no-rdoc --no-ri${os.EOL}update: --no-rdoc --no-ri${os.EOL}`)
+    } else {
+      fs.writeFileSync(gemrc, `gem: --no-document${os.EOL}`)
+    }
   }
 }
 
@@ -176,152 +182,4 @@ function envPreInstall() {
   }
 }
 
-function readBundledWithFromGemfileLock(lockFile) {
-  if (lockFile !== null) {
-    const contents = fs.readFileSync(lockFile, 'utf8')
-    const lines = contents.split(/\r?\n/)
-    const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
-    if (bundledWithLine !== -1) {
-      const nextLine = lines[bundledWithLine+1]
-      if (nextLine && /^\d+/.test(nextLine.trim())) {
-        const bundlerVersion = nextLine.trim()
-        const majorVersion = bundlerVersion.match(/^\d+/)[0]
-        console.log(`Using Bundler ${majorVersion} from ${lockFile} BUNDLED WITH ${bundlerVersion}`)
-        return majorVersion
-      }
-    }
-  }
-  return null
-}
-
-async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefix, engine, rubyVersion) {
-  var bundlerVersion = bundlerVersionInput
-
-  if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
-    bundlerVersion = readBundledWithFromGemfileLock(lockFile)
-
-    if (!bundlerVersion) {
-      bundlerVersion = 'latest'
-    }
-  }
-
-  if (bundlerVersion === 'latest') {
-    bundlerVersion = '2'
-  }
-
-  if (/^\d+/.test(bundlerVersion)) {
-    // OK
-  } else {
-    throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
-  }
-
-  if (rubyVersion.match(/^2\.[12]/)) {
-    console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
-    bundlerVersion = '1'
-  } else if (rubyVersion.startsWith('2.3')) {
-    console.log('Ruby 2.3 has a bug with Bundler 2 (https://github.com/rubygems/rubygems/issues/3570), using Bundler 1 instead on Ruby 2.3')
-    bundlerVersion = '1'
-  }
-
-  if (engine === 'ruby' && common.isHeadVersion(rubyVersion) && bundlerVersion === '2') {
-    console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
-  } else if (engine === 'truffleruby' && bundlerVersion === '1') {
-    console.log(`Using Bundler 1 shipped with ${engine}`)
-  } else if (engine === 'rubinius') {
-    console.log(`Rubinius only supports the version of Bundler shipped with it`)
-  } else {
-    const gem = path.join(rubyPrefix, 'bin', 'gem')
-    await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
-  }
-}
-
-async function bundleInstall(gemfile, lockFile, platform, engine, version) {
-  if (gemfile === null) {
-    console.log('Could not determine gemfile path, skipping "bundle install" and caching')
-    return false
-  }
-
-  // config
-  const path = 'vendor/bundle'
-
-  if (lockFile !== null) {
-    await exec.exec('bundle', ['config', '--local', 'deployment', 'true'])
-  }
-  await exec.exec('bundle', ['config', '--local', 'path', path])
-
-  // cache key
-  const paths = [path]
-  const baseKey = await computeBaseKey(platform, engine, version)
-  let key = baseKey
-  let restoreKeys
-  if (lockFile !== null) {
-    key += `-${lockFile}-${await common.hashFile(lockFile)}`
-    // If only Gemfile.lock we can reuse some of the cache (but it will keep old gem versions in the cache)
-    restoreKeys = [`${baseKey}-${lockFile}-`]
-  } else {
-    // Only exact key, to never mix native gems of different platforms or Ruby versions
-    restoreKeys = []
-  }
-  console.log(`Cache key: ${key}`)
-
-  // restore cache & install
-  let cachedKey = null
-  try {
-    cachedKey = await cache.restoreCache(paths, key, restoreKeys)
-  } catch (error) {
-    if (error.name === cache.ValidationError.name) {
-      throw error;
-    } else {
-      core.info(`[warning] There was an error restoring the cache ${error.message}`)
-    }
-  }
-
-  if (cachedKey) {
-    console.log(`Found cache for key: ${cachedKey}`)
-  }
-
-  let alreadyInstalled = false
-  if (cachedKey === key) {
-    const exitCode = await exec.exec('bundle', ['check'], { ignoreReturnCode: true })
-    alreadyInstalled = (exitCode === 0)
-  }
-
-  if (!alreadyInstalled) {
-    await exec.exec('bundle', ['install', '--jobs', '4'])
-
-    // Error handling from https://github.com/actions/cache/blob/master/src/save.ts
-    console.log('Saving cache')
-    try {
-      await cache.saveCache(paths, key)
-    } catch (error) {
-      if (error.name === cache.ValidationError.name) {
-        throw error;
-      } else if (error.name === cache.ReserveCacheError.name) {
-        core.info(error.message);
-      } else {
-        core.info(`[warning]${error.message}`)
-      }
-    }
-  }
-
-  return true
-}
-
-async function computeBaseKey(platform, engine, version) {
-  let baseKey = `setup-ruby-bundle-install-${platform}-${engine}-${version}`
-  if (engine !== 'jruby' && common.isHeadVersion(version)) {
-    let revision = '';
-    await exec.exec('ruby', ['-e', 'print RUBY_REVISION'], {
-      silent: true,
-      listeners: {
-        stdout: (data) => {
-          revision += data.toString();
-        }
-      }
-    });
-    baseKey += `-revision-${revision}`
-  }
-  return baseKey
-}
-
 if (__filename.endsWith('index.js')) { run() }

new-version.rb

@@ -0,0 +1,57 @@
+engine_input, version = ARGV.fetch(0).split('-', 2)
+
+MATCH = case engine_input
+when 'ruby', 'jruby'
+  /^\d+\.\d+\./
+when 'truffleruby'
+  /^\d+\./
+end
+
+raise unless version[MATCH]
+
+engines = [engine_input]
+engines << 'truffleruby+graalvm' if engine_input == 'truffleruby'
+
+engines.each do |engine|
+  puts engine
+
+  # Update ruby-builder-versions.json
+  file = "#{__dir__}/ruby-builder-versions.json"
+  lines = File.readlines(file, chomp: true)
+
+  from = lines.index { |line| line.include?(%{"#{engine}": [}) }
+  raise "Could not find start of #{engine}" unless from
+  to = from
+  to += 1 until lines[to].include?(']')
+
+  from += 1 # [
+  to -= 2 # head, ]
+
+  puts lines[from..to]
+
+  release_line = lines[from..to].find { |line|
+    v = line[/"([^"]+)"/, 1] and v[MATCH] == version[MATCH]
+  }
+
+  if release_line
+    append = " #{version.inspect},"
+    release_line << append unless release_line.end_with?(append)
+  else
+    lines.insert to+1, "    #{version.inspect},"
+  end
+
+  File.write(file, lines.join("\n") + "\n")
+
+  # Update README.md
+  file = "#{__dir__}/README.md"
+  lines = File.readlines(file)
+  engine_line = lines.find { |line| line.start_with?("| `#{engine}`") }
+  engine_line.sub!(/(.+ (?:-|until)) (\d+(?:\.\d+)+)/) do
+    if Gem::Version.new(version) > Gem::Version.new($2)
+      "#{$1} #{version}"
+    else
+      $&
+    end
+  end
+  File.write(file, lines.join)
+end

package.json

@@ -22,13 +22,14 @@
   },
   "homepage": "https://github.com/ruby/setup-ruby",
   "dependencies": {
-    "@actions/cache": "^1.0.2",
+    "@actions/cache": "^1.0.8",
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.4.0",
-    "@actions/exec": "^1.0.3",
+    "@actions/exec": "^1.1.0",
-    "@actions/io": "^1.0.2",
+    "@actions/io": "^1.1.1",
-    "@actions/tool-cache": "^1.3.4"
+    "@actions/tool-cache": "^1.7.1",
+    "semver": "^6.1.0"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.23.0"
+    "@vercel/ncc": "^0.31.1"
   }
 }

pre-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/sh
 set -e
+yarn install
 yarn run package
 exec git add dist/index.js

ruby-builder-versions.js

@@ -1,32 +0,0 @@
-export function getVersions(platform) {
-  const versions = {
-    "ruby": [
-      "2.1.9",
-      "2.2.10",
-      "2.3.0", "2.3.1", "2.3.2", "2.3.3", "2.3.4", "2.3.5", "2.3.6", "2.3.7", "2.3.8",
-      "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.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5", "2.6.6",
-      "2.7.0", "2.7.1", "2.7.2",
-      "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",
-      "head"
-    ],
-    "truffleruby": [
-      "19.3.0", "19.3.1",
-      "20.0.0", "20.1.0", "20.2.0",
-      "head"
-    ]
-  }
-
-  if (platform === 'ubuntu-18.04') {
-    versions['rubinius'] = [
-      "4.14"
-    ]
-  }
-
-  return versions
-}

ruby-builder-versions.json

@@ -0,0 +1,34 @@
+{
+  "ruby": [
+    "1.9.3-p551",
+    "2.0.0-p648",
+    "2.1.9",
+    "2.2.10",
+    "2.3.0", "2.3.1", "2.3.2", "2.3.3", "2.3.4", "2.3.5", "2.3.6", "2.3.7", "2.3.8",
+    "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.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4", "2.7.5",
+    "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.1.0-preview1", "3.1.0",
+    "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.3.0.0", "9.3.1.0", "9.3.2.0", "9.3.3.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",
+    "head"
+  ],
+  "truffleruby+graalvm": [
+    "21.2.0", "21.3.0",
+    "22.0.0.2",
+    "head"
+  ]
+}

ruby-builder.js

@@ -1,4 +1,5 @@
 const os = require('os')
+const fs = require('fs')
 const path = require('path')
 const exec = require('@actions/exec')
 const io = require('@actions/io')
@@ -6,32 +7,71 @@ const tc = require('@actions/tool-cache')
 const common = require('./common')
 const rubyBuilderVersions = require('./ruby-builder-versions')
 
-const builderReleaseTag = 'enable-shared'
+const builderReleaseTag = 'toolcache'
 const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
 
 const windows = common.windows
 
 export function getAvailableVersions(platform, engine) {
-  return rubyBuilderVersions.getVersions(platform)[engine]
+  return rubyBuilderVersions[engine]
 }
 
 export async function install(platform, engine, version) {
-  return await downloadAndExtract(platform, engine, version)
+  let rubyPrefix, inToolCache
-}
+  if (common.shouldUseToolCache(engine, version)) {
-
+    inToolCache = tc.find('Ruby', version)
-async function downloadAndExtract(platform, engine, version) {
+    if (inToolCache) {
-  const rubiesDir = windows ? `${common.drive}:` : path.join(os.homedir(), '.rubies')
+      rubyPrefix = inToolCache
-
+    } else {
-  const rubyPrefix = path.join(rubiesDir, `${engine}-${version}`)
+      rubyPrefix = common.getToolCacheRubyPrefix(platform, version)
-
+    }
-  // Set the PATH now, so the MSYS2 'tar' is in Path on Windows
+  } else if (windows) {
-  if (engine === 'rubinius') {
+    rubyPrefix = path.join(`${common.drive}:`, `${engine}-${version}`)
-    common.setupPath([path.join(rubyPrefix, 'bin'), path.join(rubyPrefix, 'gems', 'bin')])
   } else {
-    common.setupPath([path.join(rubyPrefix, 'bin')])
+    rubyPrefix = path.join(os.homedir(), '.rubies', `${engine}-${version}`)
   }
 
-  await io.mkdirP(rubiesDir)
+  // Set the PATH now, so the MSYS2 'tar' is in Path on Windows
+  common.setupPath([path.join(rubyPrefix, 'bin')])
+
+  if (!inToolCache) {
+    await preparePrefix(rubyPrefix)
+    if (engine === 'truffleruby+graalvm') {
+      await installWithRubyBuild(engine, version, rubyPrefix)
+    } else {
+      await downloadAndExtract(platform, engine, version, rubyPrefix)
+    }
+  }
+
+  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')
+  await common.measure('Cloning ruby-build', async () => {
+    await exec.exec('git', ['clone', 'https://github.com/rbenv/ruby-build.git', rubyBuildDir])
+  })
+
+  const rubyName = `${engine}-${version === 'head' ? 'dev' : version}`
+  await common.measure(`Installing ${engine}-${version} with ruby-build`, async () => {
+    await exec.exec(`${rubyBuildDir}/bin/ruby-build`, [rubyName, rubyPrefix])
+  })
+
+  await io.rmRF(rubyBuildDir)
+}
+
+async function downloadAndExtract(platform, engine, version, rubyPrefix) {
+  const parentDir = path.dirname(rubyPrefix)
 
   const downloadPath = await common.measure('Downloading Ruby', async () => {
     const url = getDownloadURL(platform, engine, version)
@@ -39,23 +79,32 @@ async function downloadAndExtract(platform, engine, version) {
     return await tc.downloadTool(url)
   })
 
-  await common.measure('Extracting Ruby', async () => {
+  await common.measure('Extracting  Ruby', async () => {
     if (windows) {
       // Windows 2016 doesn't have system tar, use MSYS2's, it needs unix style paths
-      await exec.exec('tar', [ '-xz', '-C', common.win2nix(rubiesDir), '-f', common.win2nix(downloadPath) ])
+      await exec.exec('tar', ['-xz', '-C', common.win2nix(parentDir), '-f', common.win2nix(downloadPath)])
     } else {
-      await exec.exec('tar', [ '-xz', '-C', rubiesDir, '-f',  downloadPath ])
+      await exec.exec('tar', ['-xz', '-C', parentDir, '-f', downloadPath])
     }
   })
 
-  return rubyPrefix
+  if (common.shouldUseToolCache(engine, version)) {
+    common.createToolCacheCompleteFile(rubyPrefix)
+  }
 }
 
 function getDownloadURL(platform, engine, version) {
+  let builderPlatform = platform
+  if (platform.startsWith('windows-')) {
+    builderPlatform = 'windows-latest'
+  } else if (platform.startsWith('macos-')) {
+    builderPlatform = 'macos-latest'
+  }
+
   if (common.isHeadVersion(version)) {
-    return getLatestHeadBuildURL(platform, engine, version)
+    return getLatestHeadBuildURL(builderPlatform, engine, version)
   } else {
-    return `${releasesURL}/download/${builderReleaseTag}/${engine}-${version}-${platform}.tar.gz`
+    return `${releasesURL}/download/${builderReleaseTag}/${engine}-${version}-${builderPlatform}.tar.gz`
   }
 }
 

rubygems.js

@@ -0,0 +1,30 @@
+const path = require('path')
+const exec = require('@actions/exec')
+const semver = require('semver')
+
+export async function rubygemsUpdate(rubygemsVersionInput, rubyPrefix) {
+  const gem = path.join(rubyPrefix, 'bin', 'gem')
+
+  let gemVersion = ''
+
+  await exec.exec(gem, ['--version'], {
+    listeners: {
+      stdout: (data) => (gemVersion += data.toString()),
+    }
+  });
+
+  gemVersion = semver.coerce(gemVersion.trim())
+  console.log(`Default RubyGems version is ${gemVersion}`)
+
+  if (rubygemsVersionInput === 'latest') {
+    console.log('Updating RubyGems to latest version')
+    await exec.exec(gem, ['update', '--system'])
+  } else if (semver.gt(rubygemsVersionInput, gemVersion)) {
+    console.log(`Updating RubyGems to ${rubygemsVersionInput}`)
+    await exec.exec(gem, ['update', '--system', rubygemsVersionInput])
+  } else {
+    console.log(`Skipping RubyGems update because the given version (${rubygemsVersionInput}) is not newer than the default version (${gemVersion})`)
+  }
+
+  return true
+}

versions-strings-for-builder.rb

@@ -1,16 +1,19 @@
-hash = File.read('ruby-builder-versions.js')[/\bversions = {[^}]+}/]
+require 'json'
-versions = eval hash
+hash = File.read('ruby-builder-versions.json')
+versions = JSON.load(hash).transform_keys(&:to_sym)
 
 by_minor = versions[:ruby].group_by { |v| v[/^\d\.\d/] }
 
-p by_minor['2.1']
+(1..7).each do |minor|
-p by_minor['2.2']
-p by_minor['2.3']
-
-(4..7).each do |minor|
   p by_minor["2.#{minor}"].map { |v| "ruby-#{v}" }
 end
 
+puts
+p (versions[:truffleruby] - %w[head]).map { |v| "truffleruby-#{v}" }
+
+puts
 p (versions[:jruby] - %w[head]).map { |v| "jruby-#{v}" }
 
-p (versions[:truffleruby] - %w[head]).map { |v| "truffleruby-#{v}" }
+(versions[:jruby] - %w[head]).each do |v|
+  puts "- { os: windows-latest, jruby-version: #{v}, ruby: jruby-#{v} }"
+end

windows-versions.json

@@ -1,9 +1,10 @@
-export const versions = {
+{
-  "2.1.9": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.1.9-x64-mingw32.7z",
+  "2.0.0": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.0.0-p648/ruby-2.0.0-p648-x64-mingw32.7z",
-  "2.2.6": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.2.6-x64-mingw32.7z",
+  "2.1.9": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.1.9/ruby-2.1.9-x64-mingw32.7z",
-  "2.3.0": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.0-x64-mingw32.7z",
+  "2.2.6": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.2.6/ruby-2.2.6-x64-mingw32.7z",
-  "2.3.1": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.1-x64-mingw32.7z",
+  "2.3.0": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.3.0/ruby-2.3.0-x64-mingw32.7z",
-  "2.3.3": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.3-x64-mingw32.7z",
+  "2.3.1": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.3.1/ruby-2.3.1-x64-mingw32.7z",
+  "2.3.3": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.3.3/ruby-2.3.3-x64-mingw32.7z",
   "2.4.1": "https://github.com/oneclick/rubyinstaller2/releases/download/2.4.1-2/rubyinstaller-2.4.1-2-x64.7z",
   "2.4.2": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.2-2/rubyinstaller-2.4.2-2-x64.7z",
   "2.4.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.3-2/rubyinstaller-2.4.3-2-x64.7z",
@@ -19,18 +20,31 @@ export const versions = {
   "2.5.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-2.5.5-1-x64.7z",
   "2.5.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.6-1/rubyinstaller-2.5.6-1-x64.7z",
   "2.5.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.7z",
-  "2.5.8": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.8-1/rubyinstaller-2.5.8-1-x64.7z",
+  "2.5.8": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.8-2/rubyinstaller-2.5.8-2-x64.7z",
+  "2.5.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.9-1/rubyinstaller-2.5.9-1-x64.7z",
   "2.6.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.0-1/rubyinstaller-2.6.0-1-x64.7z",
   "2.6.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.1-1/rubyinstaller-2.6.1-1-x64.7z",
   "2.6.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.2-1/rubyinstaller-2.6.2-1-x64.7z",
   "2.6.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x64.7z",
   "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
   "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
-  "2.6.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.6-1/rubyinstaller-2.6.6-1-x64.7z",
+  "2.6.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.6-2/rubyinstaller-2.6.6-2-x64.7z",
+  "2.6.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.7-1/rubyinstaller-2.6.7-1-x64.7z",
+  "2.6.8": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.8-1/rubyinstaller-2.6.8-1-x64.7z",
+  "2.6.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.9-1/rubyinstaller-2.6.9-1-x64.7z",
   "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z",
   "2.7.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.1-1/rubyinstaller-2.7.1-1-x64.7z",
   "2.7.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.2-1/rubyinstaller-2.7.2-1-x64.7z",
+  "2.7.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.3-1/rubyinstaller-2.7.3-1-x64.7z",
+  "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",
+  "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.1.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.0-1/rubyinstaller-3.1.0-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"
+  "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z",
+  "ucrt": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-ucrt.7z"
 }

windows.js

@@ -6,18 +6,23 @@ const path = require('path')
 const cp = require('child_process')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
+const io = require('@actions/io')
 const tc = require('@actions/tool-cache')
 const common = require('./common')
-const rubyInstallerVersions = require('./windows-versions').versions
+const rubyInstallerVersions = require('./windows-versions.json')
 
 const drive = common.drive
 
-// needed for 2.1, 2.2, 2.3, and mswin, cert file used by Git for Windows
+const msys2BasePath = 'C:\\msys64'
+
+// needed for 2.0-2.3, and mswin, cert file used by Git for Windows
 const certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem'
 
-// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.1, 2.2 and 2.3
+// location & path for old RubyInstaller DevKit (MSYS1), Ruby 2.0-2.3
-const msys = `${drive}:\\DevKit64`
+const msys1 = `${drive}:\\DevKit64`
-const msysPathEntries = [`${msys}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys}\\mingw\\bin`, `${msys}\\bin`]
+const msysPathEntries = [`${msys1}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys1}\\mingw\\bin`, `${msys1}\\bin`]
+
+const virtualEnv = common.getVirtualEnvironmentName()
 
 export function getAvailableVersions(platform, engine) {
   if (engine === 'ruby') {
@@ -30,48 +35,141 @@ export function getAvailableVersions(platform, engine) {
 export async function install(platform, engine, version) {
   const url = rubyInstallerVersions[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)
+
   if (!url.endsWith('.7z')) {
     throw new Error(`URL should end in .7z: ${url}`)
   }
   const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
 
-  const rubyPrefix = `${drive}:\\${base}`
+  let rubyPrefix, inToolCache
+  if (common.shouldUseToolCache(engine, version)) {
+    inToolCache = tc.find('Ruby', version)
+    if (inToolCache) {
+      rubyPrefix = inToolCache
+    } else {
+      rubyPrefix = common.getToolCacheRubyPrefix(platform, version)
+    }
+  } else {
+    rubyPrefix = `${drive}:\\${base}`
+  }
 
   let toolchainPaths = (version === 'mswin') ? await setupMSWin() : await setupMingw(version)
 
-  common.setupPath([`${rubyPrefix}\\bin`, ...toolchainPaths])
+  if (!inToolCache) {
+    await downloadAndExtract(engine, version, url, base, rubyPrefix);
+  }
+
+  const msys2Type = common.setupPath([`${rubyPrefix}\\bin`, ...toolchainPaths])
+
+  // install msys2 tools for all Ruby versions, only install mingw or ucrt for Rubies >= 2.4
+
+  if (!hasMSYS2PreInstalled) {
+    await installMSYS2Tools()
+  }
+
+  // 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)
+  }
+
+  const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
+  if (fs.existsSync(ridk)) {
+    await common.measure('Adding ridk env variables', async () => addRidkEnv(ridk))
+  }
+
+  return rubyPrefix
+}
+
+// Actions windows-2022 image does not contain any mingw or ucrt build tools.  Install tools for it,
+// and also install ucrt tools on earlier versions, which have msys2 and mingw tools preinstalled.
+async function installGCCTools(type) {
+  const downloadPath = await common.measure(`Downloading ${type} build tools`, async () => {
+    let url = `https://github.com/MSP-Greg/setup-msys2-gcc/releases/download/msys2-gcc-pkgs/${type}.7z`
+    console.log(url)
+    return await tc.downloadTool(url)
+  })
+
+  await common.measure(`Extracting  ${type} build tools`, async () =>
+    // -aoa overwrite existing, -bd disable progress indicator
+    exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${msys2BasePath}`], { silent: true }))
+}
+
+// Actions windows-2022 image does not contain any MSYS2 build tools.  Install tools for it.
+// A subset of the MSYS2 base-devel group
+async function 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`
+    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 })
+
+  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 }))
+}
+
+// Windows JRuby can install gems that require compile tools, only needed for
+// windows-2022 and later images
+export async function installJRubyTools() {
+  await installMSYS2Tools()
+  await installGCCTools('mingw64')
+}
+
+async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
+  const parentDir = path.dirname(rubyPrefix)
 
   const downloadPath = await common.measure('Downloading Ruby', async () => {
     console.log(url)
     return await tc.downloadTool(url)
   })
 
-  await common.measure('Extracting Ruby', async () =>
+  await common.measure('Extracting  Ruby', async () =>
-    exec.exec('7z', ['x', downloadPath, `-xr!${base}\\share\\doc`, `-o${drive}:\\`], { silent: true }))
+    // -bd disable progress indicator, -xr extract but exclude share\doc files
+    exec.exec('7z', ['x', downloadPath, '-bd', `-xr!${base}\\share\\doc`, `-o${parentDir}`], { silent: true }))
 
-  return rubyPrefix
+  if (base !== path.basename(rubyPrefix)) {
+    await io.mv(path.join(parentDir, base), rubyPrefix)
+  }
+
+  if (common.shouldUseToolCache(engine, version)) {
+    common.createToolCacheCompleteFile(rubyPrefix)
+  }
 }
 
 async function setupMingw(version) {
   core.exportVariable('MAKE', 'make.exe')
 
-  if (version.match(/^2\.[123]/)) {
+  // rename these to avoid confusion when Ruby is using OpenSSL 1.0.2.
+  // most current extconf files look for 1.1.x dll files first, which is the version of the renamed files
+  if (common.floatVersion(version) <= 2.4) {
+    renameSystem32Dlls()
+  }
+
+  if (common.floatVersion(version) <= 2.3) {
     core.exportVariable('SSL_CERT_FILE', certFile)
-    await common.measure('Installing MSYS', async () => installMSYS(version))
+    await common.measure('Installing MSYS1', async () => installMSYS1(version))
     return msysPathEntries
   } else {
     return []
   }
 }
 
-// Ruby 2.1, 2.2 and 2.3
+// Ruby 2.0-2.3
-async function installMSYS(version) {
+async function installMSYS1(version) {
-  const url = 'https://dl.bintray.com/oneclick/rubyinstaller/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe'
+  const url = 'https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe'
   const downloadPath = await tc.downloadTool(url)
-  await exec.exec('7z', ['x', downloadPath, `-o${msys}`], { silent: true })
+  await exec.exec('7z', ['x', downloadPath, `-o${msys1}`], { silent: true })
 
   // below are set in the old devkit.rb file ?
-  core.exportVariable('RI_DEVKIT', msys)
+  core.exportVariable('RI_DEVKIT', msys1)
   core.exportVariable('CC' , 'gcc')
   core.exportVariable('CXX', 'g++')
   core.exportVariable('CPP', 'cpp')
@@ -99,17 +197,30 @@ async function setupMSWin() {
 /* Sets MSVC environment for use in Actions
  *   allows steps to run without running vcvars*.bat, also for PowerShell
  *   adds a convenience VCVARS environment variable
- *   this assumes a single Visual Studio version being available in the windows-latest image */
+ *   this assumes a single Visual Studio version being available in the Windows images */
 export function addVCVARSEnv() {
-  const vcVars = '"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"'
+  let vcVars = ''
+  switch (virtualEnv) {
+    case 'windows-2016':
+      vcVars = '"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"'
+      break
+    case 'windows-2019':
+      vcVars = '"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"'
+      break
+    case 'windows-2022':
+      vcVars = '"C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"'
+      break
+    default:
+      throw new Error(`Unknown Windows Image: ${virtualEnv}`)
+  }
   core.exportVariable('VCVARS', vcVars)
 
   let newEnv = new Map()
   let cmd = `cmd.exe /c "${vcVars} && set"`
   let newSet = cp.execSync(cmd).toString().trim().split(/\r?\n/)
-  newSet = newSet.filter(line => line.match(/\S=\S/))
+  newSet = newSet.filter(line => /\S=\S/.test(line))
   newSet.forEach(s => {
-    let [k,v] = s.split('=', 2)
+    let [k,v] = common.partition(s, '=')
     newEnv.set(k,v)
   })
 
@@ -126,3 +237,35 @@ export function addVCVARSEnv() {
   }
   return newPathEntries
 }
+
+// ssl files cause issues with non RI2 Rubies (<2.4) and ruby/ruby's CI from build folder due to dll resolution
+function renameSystem32Dlls() {
+  const sys32 = 'C:\\Windows\\System32\\'
+  const badFiles = [`${sys32}libcrypto-1_1-x64.dll`, `${sys32}libssl-1_1-x64.dll`]
+  const existing = badFiles.filter((dll) => fs.existsSync(dll))
+  if (existing.length > 0) {
+    console.log(`Renaming ${existing.join(' and ')} to avoid dll resolution conflicts on Ruby <= 2.4`)
+    existing.forEach(dll => fs.renameSync(dll, `${dll}_`))
+  }
+}
+
+// Sets MSYS2 ENV variables set from running `ridk enable`
+function addRidkEnv(ridk) {
+  let newEnv = new Map()
+  let cmd = `cmd.exe /c "${ridk} enable && set"`
+  let newSet = cp.execSync(cmd).toString().trim().split(/\r?\n/)
+  newSet = newSet.filter(line => /^\S+=\S+/.test(line))
+  newSet.forEach(s => {
+    let [k, v] = common.partition(s, '=')
+    newEnv.set(k, v)
+  })
+
+  for (let [k, v] of newEnv) {
+    if (process.env[k] !== v) {
+      if (!/^Path$/i.test(k)) {
+        console.log(`${k}=${v}`)
+        core.exportVariable(k, v)
+      }
+    }
+  }
+}

yarn.lock

@@ -1,417 +1,386 @@
-# 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.2":
+"@actions/cache@^1.0.8":
-  version "1.0.2"
+  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-1.0.2.tgz#a223dcc752c7f988016d28ee7232f930f85cec61"
+  resolved "https://registry.yarnpkg.com/@actions/cache/-/cache-1.0.8.tgz#426ad3a2127b35a4e21ad906e02202dc8b96663f"
-  integrity sha512-CzAseaJ4cKmOI58EIWUb/LfeYdM7Y25s39OEMtWAhEPrPPzrbSEjGHCLaYjJ0V8C4iojo8vBYh5B3OIJ37EiJw==
+  integrity sha512-GWNNB67w93HGJRQXlsV56YqrdAuDoP3esK/mo5mzU8WoDCVjtQgJGsTdkYUX7brswtT7xnI30bWNo1WLKQ8FZQ==
-  dependencies:
+  dependencies:
-    "@actions/core" "^1.2.4"
+    "@actions/core" "^1.2.6"
-    "@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.8"
+    "@actions/http-client" "^1.0.9"
-    "@actions/io" "^1.0.1"
+    "@actions/io" "^1.0.1"
-    "@azure/ms-rest-js" "^2.0.7"
+    "@azure/ms-rest-js" "^2.0.7"
-    "@azure/storage-blob" "^12.1.2"
+    "@azure/storage-blob" "^12.1.2"
-    semver "^6.1.0"
+    semver "^6.1.0"
-    uuid "^3.3.3"
+    uuid "^3.3.3"
-
+
-"@actions/core@^1.2.0", "@actions/core@^1.2.3", "@actions/core@^1.2.4", "@actions/core@^1.2.6":
+"@actions/core@^1.2.6", "@actions/core@^1.4.0":
-  version "1.2.6"
+  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.6.tgz#a78d49f41a4def18e88ce47c2cac615d5694bf09"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz#cf2e6ee317e314b03886adfeb20e448d50d6e524"
-  integrity sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==
+  integrity sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg==
-
+
-"@actions/exec@^1.0.0", "@actions/exec@^1.0.1", "@actions/exec@^1.0.3":
+"@actions/exec@^1.0.0", "@actions/exec@^1.0.1", "@actions/exec@^1.1.0":
-  version "1.0.4"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.0.4.tgz#99d75310e62e59fc37d2ee6dcff6d4bffadd3a5d"
+  resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.0.tgz#53441d968e56d2fec69ad3f15773d4d94e01162c"
-  integrity sha512-4DPChWow9yc9W3WqEbUj8Nr86xkpyE29ZzWjXucHItclLbEW6jr80Zx4nqv18QL6KK65+cifiQZXvnqgTV6oHw==
+  integrity sha512-LImpN9AY0J1R1mEYJjVJfSZWU4zYOlEcwSTgPve1rFQqK5AwrEs6uWW5Rv70gbDIQIAUwI86z6B+9mPK4w9Sbg==
-  dependencies:
+  dependencies:
-    "@actions/io" "^1.0.1"
+    "@actions/io" "^1.0.1"
-
+
-"@actions/glob@^0.1.0":
+"@actions/glob@^0.1.0":
-  version "0.1.0"
+  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@actions/glob/-/glob-0.1.0.tgz#969ceda7e089c39343bca3306329f41799732e40"
+  resolved "https://registry.yarnpkg.com/@actions/glob/-/glob-0.1.2.tgz#9685ed2d6583093479c8f137d067c4329d7d0974"
-  integrity sha512-lx8SzyQ2FE9+UUvjqY1f28QbTJv+w8qP7kHHbfQRhphrlcx0Mdmm1tZdGJzfxv1jxREa/sLW4Oy8CbGQKCJySA==
+  integrity sha512-SclLR7Ia5sEqjkJTPs7Sd86maMDw43p769YxBOxvPvEWuPEhpAnBsQfENOpXjFYMmhCqd127bmf+YdvJqVqR4A==
-  dependencies:
+  dependencies:
-    "@actions/core" "^1.2.0"
+    "@actions/core" "^1.2.6"
-    minimatch "^3.0.4"
+    minimatch "^3.0.4"
-
+
-"@actions/http-client@^1.0.8":
+"@actions/http-client@^1.0.8", "@actions/http-client@^1.0.9":
-  version "1.0.8"
+  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.8.tgz#8bd76e8eca89dc8bcf619aa128eba85f7a39af45"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
-  integrity sha512-G4JjJ6f9Hb3Zvejj+ewLLKLf99ZC+9v+yCxoYf9vSyH+WkzPLB2LuUtRMGNkooMqdugGBFStIKXOuvH1W+EctA==
+  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
-  dependencies:
+  dependencies:
-    tunnel "0.0.6"
+    tunnel "0.0.6"
-
+
-"@actions/io@^1.0.1", "@actions/io@^1.0.2":
+"@actions/io@^1.0.1", "@actions/io@^1.1.1":
-  version "1.0.2"
+  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.0.2.tgz#2f614b6e69ce14d191180451eb38e6576a6e6b27"
+  resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.1.tgz#4a157406309e212ab27ed3ae30e8c1d641686a66"
-  integrity sha512-J8KuFqVPr3p6U8W93DOXlXW6zFvrQAJANdS+vw0YhusLIq+bszW8zmK2Fh1C2kDPX8FMvwIl1OUcFgvJoXLbAg==
+  integrity sha512-Qi4JoKXjmE0O67wAOH6y0n26QXhMKMFo7GD/4IXNVcrtLjUlGjGuVys6pQgwF3ArfGTQu0XpqaNr0YhED2RaRA==
-
+
-"@actions/tool-cache@^1.3.4":
+"@actions/tool-cache@^1.7.1":
-  version "1.6.0"
+  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.6.0.tgz#5b425db2d642df65dd0d6bcec0d84dcdbca3f80d"
+  resolved "https://registry.yarnpkg.com/@actions/tool-cache/-/tool-cache-1.7.1.tgz#f9f4f822cb639da6facdf3e22ea571361ab26f92"
-  integrity sha512-+fyEBImPD3m5I0o6DflCO0NHY180LPoX8Lo6y4Iez+V17kO8kfkH0VHxb8mUdmD6hn9dWA9Ch1JA20fXoIYUeQ==
+  integrity sha512-y1xxxOhXaBUIUit3lhepmu/0xdgiTMpnZRLmVdtF0hTm521doi+MdRRRP62czHvM7wxH6epj4JPNJQ3iJpOrkQ==
-  dependencies:
+  dependencies:
-    "@actions/core" "^1.2.3"
+    "@actions/core" "^1.2.6"
-    "@actions/exec" "^1.0.0"
+    "@actions/exec" "^1.0.0"
-    "@actions/http-client" "^1.0.8"
+    "@actions/http-client" "^1.0.8"
-    "@actions/io" "^1.0.1"
+    "@actions/io" "^1.1.1"
-    semver "^6.1.0"
+    semver "^6.1.0"
-    uuid "^3.3.2"
+    uuid "^3.3.2"
-
+
-"@azure/abort-controller@^1.0.0":
+"@azure/abort-controller@^1.0.0":
-  version "1.0.1"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.1.tgz#8510935b25ac051e58920300e9d7b511ca6e656a"
+  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz#fd3c4d46c8ed67aace42498c8e2270960250eafd"
-  integrity sha512-wP2Jw6uPp8DEDy0n4KNidvwzDjyVV2xnycEIq7nPzj1rHyb/r+t3OPeNT1INZePP2wy5ZqlwyuyOMTi0ePyY1A==
+  integrity sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==
-  dependencies:
+  dependencies:
-    tslib "^1.9.3"
+    tslib "^2.0.0"
-
+
-"@azure/core-asynciterator-polyfill@^1.0.0":
+"@azure/core-asynciterator-polyfill@^1.0.0":
-  version "1.0.0"
+  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7"
+  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7"
-  integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==
+  integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==
-
+
-"@azure/core-auth@^1.1.3":
+"@azure/core-auth@^1.1.4", "@azure/core-auth@^1.3.0":
-  version "1.1.3"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.1.3.tgz#94e7bbc207010e7a2fdba61565443e4e1cf1e131"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.0.tgz#0d55517cf0650aefe755669aca8a2f3724fcf536"
-  integrity sha512-A4xigW0YZZpkj1zK7dKuzbBpGwnhEcRk6WWuIshdHC32raR3EQ1j6VA9XZqE+RFsUgH6OAmIK5BWIz+mZjnd6Q==
+  integrity sha512-kSDSZBL6c0CYdhb+7KuutnKGf2geeT+bCJAgccB0DD7wmNJSsQPcF7TcuoZX83B7VK4tLz/u+8sOO/CnCsYp8A==
-  dependencies:
+  dependencies:
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-tracing" "1.0.0-preview.8"
+    tslib "^2.0.0"
-    "@opentelemetry/api" "^0.6.1"
+
-    tslib "^2.0.0"
+"@azure/core-http@^1.2.0":
-
+  version "1.2.6"
-"@azure/core-http@^1.1.1":
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-1.2.6.tgz#9cd508418572d2062fd3175274219438772bdb65"
-  version "1.1.6"
+  integrity sha512-odtH7UMKtekc5YQ86xg9GlVHNXR6pq2JgJ5FBo7/jbOjNGdBqcrIVrZx2bevXVJz/uUTSx6vUf62gzTXTfqYSQ==
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-1.1.6.tgz#9d76bc569c9907e3224bd09c09b4ac08bde9faf8"
+  dependencies:
-  integrity sha512-/C+qNzhwlLKt0F6SjaBEyY2pwZvwL2LviyS5PHlCh77qWuTF1sETmYAINM88BCN+kke+UlECK4YOQaAjJwyHvQ==
+    "@azure/abort-controller" "^1.0.0"
-  dependencies:
+    "@azure/core-asynciterator-polyfill" "^1.0.0"
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-auth" "^1.3.0"
-    "@azure/core-auth" "^1.1.3"
+    "@azure/core-tracing" "1.0.0-preview.11"
-    "@azure/core-tracing" "1.0.0-preview.9"
+    "@azure/logger" "^1.0.0"
-    "@azure/logger" "^1.0.0"
+    "@types/node-fetch" "^2.5.0"
-    "@opentelemetry/api" "^0.10.2"
+    "@types/tunnel" "^0.0.1"
-    "@types/node-fetch" "^2.5.0"
+    form-data "^3.0.0"
-    "@types/tunnel" "^0.0.1"
+    node-fetch "^2.6.0"
-    form-data "^3.0.0"
+    process "^0.11.10"
-    node-fetch "^2.6.0"
+    tough-cookie "^4.0.0"
-    process "^0.11.10"
+    tslib "^2.2.0"
-    tough-cookie "^4.0.0"
+    tunnel "^0.0.6"
-    tslib "^2.0.0"
+    uuid "^8.3.0"
-    tunnel "^0.0.6"
+    xml2js "^0.4.19"
-    uuid "^8.1.0"
+
-    xml2js "^0.4.19"
+"@azure/core-lro@^1.0.2":
-
+  version "1.0.5"
-"@azure/core-lro@^1.0.2":
+  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-1.0.5.tgz#856a2cb6a9bec739ee9cde33a27cc28f81ac0522"
-  version "1.0.2"
+  integrity sha512-0EFCFZxARrIoLWMIRt4vuqconRVIO2Iin7nFBfJiYCCbKp5eEmxutNk8uqudPmG0XFl5YqlVh68/al/vbE5OOg==
-  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-1.0.2.tgz#b7b51ff7b84910b7eb152a706b0531d020864f31"
+  dependencies:
-  integrity sha512-Yr0JD7GKryOmbcb5wHCQoQ4KCcH5QJWRNorofid+UvudLaxnbCfvKh/cUfQsGUqRjO9L/Bw4X7FP824DcHdMxw==
+    "@azure/abort-controller" "^1.0.0"
-  dependencies:
+    "@azure/core-http" "^1.2.0"
-    "@azure/abort-controller" "^1.0.0"
+    "@azure/core-tracing" "1.0.0-preview.11"
-    "@azure/core-http" "^1.1.1"
+    events "^3.0.0"
-    events "^3.0.0"
+    tslib "^2.0.0"
-    tslib "^1.10.0"
+
-
+"@azure/core-paging@^1.1.1":
-"@azure/core-paging@^1.1.1":
+  version "1.1.3"
-  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.3.tgz#3587c9898a0530cacb64bab216d7318468aa5efc"
-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.1.tgz#9639d2d5b6631d481d81040504e0e26c003f47b1"
+  integrity sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==
-  integrity sha512-hqEJBEGKan4YdOaL9ZG/GRG6PXaFd/Wb3SSjQW4LWotZzgl6xqG00h6wmkrpd2NNkbBkD1erLHBO3lPHApv+iQ==
+  dependencies:
-  dependencies:
+    "@azure/core-asynciterator-polyfill" "^1.0.0"
-    "@azure/core-asynciterator-polyfill" "^1.0.0"
+
-
+"@azure/core-tracing@1.0.0-preview.11":
-"@azure/core-tracing@1.0.0-preview.8":
+  version "1.0.0-preview.11"
-  version "1.0.0-preview.8"
+  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.11.tgz#bdfb2ba73cd6c39b7d6c207b9522eb98e08b4ddd"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.8.tgz#1e0ff857e855edb774ffd33476003c27b5bb2705"
+  integrity sha512-frF0pJc9HTmKncVokhBxCqipjbql02DThQ1ZJ9wLi7SDMLdPAFyDI5xZNzX5guLz+/DtPkY+SGK2li9FIXqshQ==
-  integrity sha512-ZKUpCd7Dlyfn7bdc+/zC/sf0aRIaNQMDuSj2RhYRFe3p70hVAnYGp3TX4cnG2yoEALp/LTj/XnZGQ8Xzf6Ja/Q==
+  dependencies:
-  dependencies:
+    "@opencensus/web-types" "0.0.7"
-    "@opencensus/web-types" "0.0.7"
+    "@opentelemetry/api" "1.0.0-rc.0"
-    "@opentelemetry/api" "^0.6.1"
+    tslib "^2.0.0"
-    tslib "^1.10.0"
+
-
+"@azure/logger@^1.0.0":
-"@azure/core-tracing@1.0.0-preview.9":
+  version "1.0.2"
-  version "1.0.0-preview.9"
+  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.2.tgz#ad2d06478eeda7835f53def7e4566981b47d9787"
-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.9.tgz#84f3b85572013f9d9b85e1e5d89787aa180787eb"
+  integrity sha512-YZNjNV0vL3nN2nedmcjQBcpCTo3oqceXmgiQtEm6fLpucjRZyQKAQruhCmCpRlB1iykqKJJ/Y8CDmT5rIE6IJw==
-  integrity sha512-zczolCLJ5QG42AEPQ+Qg9SRYNUyB+yZ5dzof4YEc+dyWczO9G2sBqbAjLB7IqrsdHN2apkiB2oXeDKCsq48jug==
+  dependencies:
-  dependencies:
+    tslib "^2.0.0"
-    "@opencensus/web-types" "0.0.7"
+
-    "@opentelemetry/api" "^0.10.2"
+"@azure/ms-rest-js@^2.0.7":
-    tslib "^2.0.0"
+  version "2.5.2"
-
+  resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.5.2.tgz#41d2e12456447dc21b4aaa09e74d1550eaf38f14"
-"@azure/logger@^1.0.0":
+  integrity sha512-9nCuuoYwHZEZw1t0MVtENH+c1k2R4maYAlBBDSZhZu6bEucyfYUUigNXXKjt2cFBt4sO+sTzi0uI0f/fiPFr+Q==
-  version "1.0.0"
+  dependencies:
-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.0.tgz#48b371dfb34288c8797e5c104f6c4fb45bf1772c"
+    "@azure/core-auth" "^1.1.4"
-  integrity sha512-g2qLDgvmhyIxR3JVS8N67CyIOeFRKQlX/llxYJQr1OSGQqM3HTpVP8MjmjcEKbL/OIt2N9C9UFaNQuKOw1laOA==
+    abort-controller "^3.0.0"
-  dependencies:
+    form-data "^2.5.0"
-    tslib "^1.9.3"
+    node-fetch "^2.6.0"
-
+    tough-cookie "^3.0.1"
-"@azure/ms-rest-js@^2.0.7":
+    tslib "^1.10.0"
-  version "2.0.8"
+    tunnel "0.0.6"
-  resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.0.8.tgz#f84304fba29e699fc7a391ce47af2824af4f585e"
+    uuid "^3.3.2"
-  integrity sha512-PO4pnYaF66IAB/RWbhrTprGyhOzDzsgcbT7z8k3O38JKlwifbrhW+8M0fzx0ScZnaacP8rZyBazYMUF9P12c0g==
+    xml2js "^0.4.19"
-  dependencies:
+
-    "@types/node-fetch" "^2.3.7"
+"@azure/storage-blob@^12.1.2":
-    "@types/tunnel" "0.0.1"
+  version "12.6.0"
-    abort-controller "^3.0.0"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.6.0.tgz#9905d80e5f908a573cc65e1cb8302abc32818844"
-    form-data "^2.5.0"
+  integrity sha512-cAzsae+5ZdhugQfIT7o5SlVyF2Sc+HygZdPO41ZYdXklfGUyEt+5K4PyM5HQDc0MTVt6x7+waXcaAXT2eF9E6A==
-    node-fetch "^2.6.0"
+  dependencies:
-    tough-cookie "^3.0.1"
+    "@azure/abort-controller" "^1.0.0"
-    tslib "^1.10.0"
+    "@azure/core-http" "^1.2.0"
-    tunnel "0.0.6"
+    "@azure/core-lro" "^1.0.2"
-    uuid "^3.3.2"
+    "@azure/core-paging" "^1.1.1"
-    xml2js "^0.4.19"
+    "@azure/core-tracing" "1.0.0-preview.11"
-
+    "@azure/logger" "^1.0.0"
-"@azure/storage-blob@^12.1.2":
+    events "^3.0.0"
-  version "12.1.2"
+    tslib "^2.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.1.2.tgz#046d146a3bd2622b61d6bdc5708955893a5b4f04"
+
-  integrity sha512-PCHgG4r3xLt5FaFj+uiMqrRpuzD3TD17cvxCeA1JKK2bJEf8b07H3QRLQVf0DM1MmvYY8FgQagkWZTp+jr9yew==
+"@opencensus/web-types@0.0.7":
-  dependencies:
+  version "0.0.7"
-    "@azure/abort-controller" "^1.0.0"
+  resolved "https://registry.yarnpkg.com/@opencensus/web-types/-/web-types-0.0.7.tgz#4426de1fe5aa8f624db395d2152b902874f0570a"
-    "@azure/core-http" "^1.1.1"
+  integrity sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g==
-    "@azure/core-lro" "^1.0.2"
+
-    "@azure/core-paging" "^1.1.1"
+"@opentelemetry/api@1.0.0-rc.0":
-    "@azure/core-tracing" "1.0.0-preview.8"
+  version "1.0.0-rc.0"
-    "@azure/logger" "^1.0.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.0-rc.0.tgz#0c7c3f5e1285f99cedb563d74ad1adb9822b5144"
-    "@opentelemetry/api" "^0.6.1"
+  integrity sha512-iXKByCMfrlO5S6Oh97BuM56tM2cIBB0XsL/vWF/AtJrJEKx4MC/Xdu0xDsGXMGcNWpqF7ujMsjjnp0+UHBwnDQ==
-    events "^3.0.0"
+
-    tslib "^1.10.0"
+"@types/node-fetch@^2.5.0":
-
+  version "2.5.10"
-"@opencensus/web-types@0.0.7":
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
-  version "0.0.7"
+  integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
-  resolved "https://registry.yarnpkg.com/@opencensus/web-types/-/web-types-0.0.7.tgz#4426de1fe5aa8f624db395d2152b902874f0570a"
+  dependencies:
-  integrity sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g==
+    "@types/node" "*"
-
+    form-data "^3.0.0"
-"@opentelemetry/api@^0.10.2":
+
-  version "0.10.2"
+"@types/node@*":
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.10.2.tgz#9647b881f3e1654089ff7ea59d587b2d35060654"
+  version "15.12.3"
-  integrity sha512-GtpMGd6vkzDMYcpu2t9LlhEgMy/SzBwRnz48EejlRArYqZzqSzAsKmegUK7zHgl+EOIaK9mKHhnRaQu3qw20cA==
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.3.tgz#2817bf5f25bc82f56579018c53f7d41b1830b1af"
-  dependencies:
+  integrity sha512-SNt65CPCXvGNDZ3bvk1TQ0Qxoe3y1RKH88+wZ2Uf05dduBCqqFQ76ADP9pbT+Cpvj60SkRppMCh2Zo8tDixqjQ==
-    "@opentelemetry/context-base" "^0.10.2"
+
-
+"@types/tunnel@^0.0.1":
-"@opentelemetry/api@^0.6.1":
+  version "0.0.1"
-  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.6.1.tgz#a00b504801f408230b9ad719716fe91ad888c642"
+  integrity sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==
-  integrity sha512-wpufGZa7tTxw7eAsjXJtiyIQ42IWQdX9iUQp7ACJcKo1hCtuhLU+K2Nv1U6oRwT1oAlZTE6m4CgWKZBhOiau3Q==
+  dependencies:
-  dependencies:
+    "@types/node" "*"
-    "@opentelemetry/context-base" "^0.6.1"
+
-
+"@vercel/ncc@^0.31.1":
-"@opentelemetry/context-base@^0.10.2":
+  version "0.31.1"
-  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.31.1.tgz#9346c7e59326f5eeac75c0286e47df94c2d6d8f7"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def"
+  integrity sha512-g0FAxwdViI6UzsiVz5HssIHqjcPa1EHL6h+2dcJD893SoCJaGdqqgUF09xnMW6goWnnhbLvgiKlgJWrJa+7qYA==
-  integrity sha512-hZNKjKOYsckoOEgBziGMnBcX0M7EtstnCmwz5jZUOUYwlZ+/xxX6z3jPu1XVO2Jivk0eLfuP9GP+vFD49CMetw==
+
-
+abort-controller@^3.0.0:
-"@opentelemetry/context-base@^0.6.1":
+  version "3.0.0"
-  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.6.1.tgz#b260e454ee4f9635ea024fc83be225e397f15363"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  integrity sha512-5bHhlTBBq82ti3qPT15TRxkYTFPPQWbnkkQkmHPtqiS1XcTB69cEKd3Jm7Cfi/vkPoyxapmePE9tyA7EzLt8SQ==
+  dependencies:
-
+    event-target-shim "^5.0.0"
-"@types/node-fetch@^2.3.7", "@types/node-fetch@^2.5.0":
+
-  version "2.5.7"
+asynckit@^0.4.0:
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
+  version "0.4.0"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  dependencies:
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-    "@types/node" "*"
+
-    form-data "^3.0.0"
+balanced-match@^1.0.0:
-
+  version "1.0.2"
-"@types/node@*":
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  version "14.6.0"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
+
-  integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==
+brace-expansion@^1.1.7:
-
+  version "1.1.11"
-"@types/tunnel@0.0.1", "@types/tunnel@^0.0.1":
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  version "0.0.1"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c"
+  dependencies:
-  integrity sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==
+    balanced-match "^1.0.0"
-  dependencies:
+    concat-map "0.0.1"
-    "@types/node" "*"
+
-
+combined-stream@^1.0.6, combined-stream@^1.0.8:
-"@vercel/ncc@^0.23.0":
+  version "1.0.8"
-  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.23.0.tgz#628f293f8ae2038d004378f864396ad8fc14380c"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  integrity sha512-Fcr1qlG9t54X4X9qbo/+jr1+t5Qc6H3TgIRBXmKkF/WDs6YFulAN6ilq2Ehx38RbgIOFxaZnjlAQ50GyexnMpQ==
+  dependencies:
-
+    delayed-stream "~1.0.0"
-abort-controller@^3.0.0:
+
-  version "3.0.0"
+concat-map@0.0.1:
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  version "0.0.1"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  dependencies:
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-    event-target-shim "^5.0.0"
+
-
+delayed-stream@~1.0.0:
-asynckit@^0.4.0:
+  version "1.0.0"
-  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
-
+event-target-shim@^5.0.0:
-balanced-match@^1.0.0:
+  version "5.0.1"
-  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
-
+events@^3.0.0:
-brace-expansion@^1.1.7:
+  version "3.3.0"
-  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+
-  dependencies:
+form-data@^2.5.0:
-    balanced-match "^1.0.0"
+  version "2.5.1"
-    concat-map "0.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
-
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
-combined-stream@^1.0.6, combined-stream@^1.0.8:
+  dependencies:
-  version "1.0.8"
+    asynckit "^0.4.0"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+    combined-stream "^1.0.6"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+    mime-types "^2.1.12"
-  dependencies:
+
-    delayed-stream "~1.0.0"
+form-data@^3.0.0:
-
+  version "3.0.1"
-concat-map@0.0.1:
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  version "0.0.1"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  dependencies:
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+    asynckit "^0.4.0"
-
+    combined-stream "^1.0.8"
-delayed-stream@~1.0.0:
+    mime-types "^2.1.12"
-  version "1.0.0"
+
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ip-regex@^2.1.0:
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  version "2.1.0"
-
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-event-target-shim@^5.0.0:
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-  version "5.0.1"
+
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+mime-db@1.48.0:
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+  version "1.48.0"
-
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
-events@^3.0.0:
+  integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
-  version "3.2.0"
+
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+mime-types@^2.1.12:
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+  version "2.1.31"
-
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
-form-data@^2.5.0:
+  integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
-  version "2.5.1"
+  dependencies:
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+    mime-db "1.48.0"
-  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+
-  dependencies:
+minimatch@^3.0.4:
-    asynckit "^0.4.0"
+  version "3.0.4"
-    combined-stream "^1.0.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-    mime-types "^2.1.12"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-
+  dependencies:
-form-data@^3.0.0:
+    brace-expansion "^1.1.7"
-  version "3.0.0"
+
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
+node-fetch@^2.6.0:
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+  version "2.6.1"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
-    asynckit "^0.4.0"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
-    combined-stream "^1.0.8"
+
-    mime-types "^2.1.12"
+process@^0.11.10:
-
+  version "0.11.10"
-ip-regex@^2.1.0:
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  version "2.1.0"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+psl@^1.1.28, psl@^1.1.33:
-
+  version "1.8.0"
-mime-db@1.44.0:
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  version "1.44.0"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+punycode@^2.1.1:
-
+  version "2.1.1"
-mime-types@^2.1.12:
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  version "2.1.27"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+sax@>=0.6.0:
-  dependencies:
+  version "1.2.4"
-    mime-db "1.44.0"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-minimatch@^3.0.4:
+
-  version "3.0.4"
+semver@^6.1.0:
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  version "6.3.0"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  dependencies:
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-    brace-expansion "^1.1.7"
+
-
+tough-cookie@^3.0.1:
-node-fetch@^2.6.0:
+  version "3.0.1"
-  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+  dependencies:
-
+    ip-regex "^2.1.0"
-process@^0.11.10:
+    psl "^1.1.28"
-  version "0.11.10"
+    punycode "^2.1.1"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+tough-cookie@^4.0.0:
-
+  version "4.0.0"
-psl@^1.1.28, psl@^1.1.33:
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  version "1.8.0"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  dependencies:
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+    psl "^1.1.33"
-
+    punycode "^2.1.1"
-punycode@^2.1.1:
+    universalify "^0.1.2"
-  version "2.1.1"
+
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+tslib@^1.10.0:
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "1.14.1"
-
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-sax@>=0.6.0:
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-  version "1.2.4"
+
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+tslib@^2.0.0, tslib@^2.2.0:
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  version "2.3.0"
-
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-semver@^6.1.0:
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-  version "6.3.0"
+
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+tunnel@0.0.6, tunnel@^0.0.6:
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "0.0.6"
-
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-tough-cookie@^3.0.1:
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-  version "3.0.1"
+
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+universalify@^0.1.2:
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  version "0.1.2"
-  dependencies:
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-    ip-regex "^2.1.0"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-    psl "^1.1.28"
+
-    punycode "^2.1.1"
+uuid@^3.3.2, uuid@^3.3.3:
-
+  version "3.4.0"
-tough-cookie@^4.0.0:
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  version "4.0.0"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+uuid@^8.3.0:
-  dependencies:
+  version "8.3.2"
-    psl "^1.1.33"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-    punycode "^2.1.1"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-    universalify "^0.1.2"
+
-
+xml2js@^0.4.19:
-tslib@^1.10.0, tslib@^1.9.3:
+  version "0.4.23"
-  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+  dependencies:
-
+    sax ">=0.6.0"
-tslib@^2.0.0:
+    xmlbuilder "~11.0.0"
-  version "2.0.1"
+
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+xmlbuilder@~11.0.0:
-  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+  version "11.0.1"
-
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-tunnel@0.0.6, tunnel@^0.0.6:
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
-universalify@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-uuid@^3.3.2, uuid@^3.3.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.1.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
-  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
-
-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==