diff options
| -rwxr-xr-x | .expeditor/scripts/bk_container_prep.sh | 7 | ||||
| -rw-r--r-- | .expeditor/scripts/bk_win_prep.ps1 | 8 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 1 |
3 files changed, 2 insertions, 14 deletions
diff --git a/.expeditor/scripts/bk_container_prep.sh b/.expeditor/scripts/bk_container_prep.sh index 949f75c0d3..1f2961da20 100755 --- a/.expeditor/scripts/bk_container_prep.sh +++ b/.expeditor/scripts/bk_container_prep.sh @@ -11,11 +11,8 @@ if [ -f /etc/debian_version ]; then touch /etc/network/interfaces fi -# make sure we have the omnibus_overrides specified version of rubygems / bundler -echo "--- Install proper bundler" -gem uninstall bundler -a -x || true -gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) -bundle --version + +# remove default bundler config if there is one rm -f .bundle/config echo "+++ Run tests" diff --git a/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1 index 1a09378fee..243db0f822 100644 --- a/.expeditor/scripts/bk_win_prep.ps1 +++ b/.expeditor/scripts/bk_win_prep.ps1 @@ -2,17 +2,9 @@ echo "--- system details" $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize -echo "--- update bundler" - ruby -v if (-not $?) { throw "Can't run Ruby. Is it installed?" } -$env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) -$env:BUNDLER_VERSION=($env:BUNDLER_VERSION -replace '"', "") -echo $env:BUNDLER_VERSION - -gem install bundler -v $env:BUNDLER_VERSION --force --no-document --quiet -if (-not $?) { throw "Unable to update Bundler" } bundle --version echo "--- bundle install" diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index b7d515341a..e27b55bc98 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -4,7 +4,6 @@ # NOTE: You MUST update omnibus-software when adding new versions of # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock override :rubygems, version: "3.1.4" # pin to what ships in the ruby version -override :bundler, version: "2.1.4" # pin to what ships in the ruby version override "libarchive", version: "3.5.0" override "libffi", version: "3.3" override "libiconv", version: "1.16" |