diff options
| author | Christopher A. Snapp <csnapp@chef.io> | 2019-10-02 18:08:07 -0600 |
|---|---|---|
| committer | Christopher A. Snapp <csnapp@chef.io> | 2019-10-02 18:14:39 -0600 |
| commit | 4893b4e4e205c3a17c562dc5ec18c30c5f3116a1 (patch) | |
| tree | e255bf544f5c911aba450875603a14a91ec0f216 /scripts | |
| parent | 8a153f06cd1e0e3a52232d957ef6868c6efc7b0b (diff) | |
| download | chef-4893b4e4e205c3a17c562dc5ec18c30c5f3116a1.tar.gz | |
Bump Ruby to 2.6.5 to address CVEs #8951
Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 6 | ||||
| -rw-r--r-- | scripts/bk_tests/bk_win_functional.ps1 | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh index 12c7594a8d..d08bcf38c6 100755 --- a/scripts/bk_tests/bk_linux_exec.sh +++ b/scripts/bk_tests/bk_linux_exec.sh @@ -32,9 +32,9 @@ sudo git clone https://github.com/asdf-vm/asdf.git /opt/asdf echo "--- Installing Ruby ASDF plugin" /opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git -echo "--- Installing Ruby 2.6.4" -/opt/asdf/bin/asdf install ruby 2.6.4 -/opt/asdf/bin/asdf global ruby 2.6.4 +echo "--- Installing Ruby 2.6.5" +/opt/asdf/bin/asdf install ruby 2.6.5 +/opt/asdf/bin/asdf global ruby 2.6.5 # Update Gems gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1 index 085f22e40c..3cca7a7fff 100644 --- a/scripts/bk_tests/bk_win_functional.ps1 +++ b/scripts/bk_tests/bk_win_functional.ps1 @@ -14,13 +14,13 @@ $ErrorActionPreference = 'Stop' echo "Downloading Ruby + DevKit" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -(New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-devkit-2.6.4-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.4-1-x64.exe') +(New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-devkit-2.6.5-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.5-1-x64.exe') echo "Installing Ruby + DevKit" -Start-Process c:\rubyinstaller-devkit-2.6.4-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait +Start-Process c:\rubyinstaller-devkit-2.6.5-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait echo "Cleaning up installation" -Remove-Item c:\rubyinstaller-devkit-2.6.4-1-x64.exe -Force +Remove-Item c:\rubyinstaller-devkit-2.6.5-1-x64.exe -Force echo "Closing out the layer (this can take awhile)" # Set-Item -Path Env:Path -Value to include ruby26 |