diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-07-28 09:49:21 -0700 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-08-09 14:43:13 -0700 |
| commit | 3b18bdadf12f37e6edf806724957bbf096a7e06b (patch) | |
| tree | 13f804e872d7364a5bb660fa51a986682afaf13f | |
| parent | 612808ed868ba8c00076ff90687ed6ed9abfe003 (diff) | |
| download | chef-3b18bdadf12f37e6edf806724957bbf096a7e06b.tar.gz | |
starting to integrate ruby 3.1 into the builds
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | .expeditor/scripts/ensure-minimum-viable-hab.ps1 | 4 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 30 |
2 files changed, 3 insertions, 31 deletions
diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 index 10bfeb0fa8..c8a483544a 100644 --- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 +++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 @@ -1,7 +1,9 @@ [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0] if ($hab_version -lt [Version]"0.85.0" ) { Write-Host "--- :habicat: Installing the version of Habitat required" - install-habitat --version 0.85.0.20190916 + # install-habitat --version 0.85.0.20190916 + Set-ExecutionPolicy Bypass -Scope Process -Force + Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1')) if (-not $?) { throw "Hab version is older than 0.85 and could not update it." } } else { Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed" diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 09715e28e9..c963ac7e03 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -12,36 +12,6 @@ expeditor: steps: ######################################################################### - # Tests Ruby 2.6 -######################################################################### - -# - label: "chef-utils Unit :ruby: 2.6" -# commands: -# - /workdir/.expeditor/scripts/bk_container_prep.sh -# - cd chef-utils -# - bundle config set --local without omnibus_package -# - bundle config set --local path 'vendor/bundle' -# - bundle install --jobs=3 --retry=3 -# - bundle exec rake spec -# expeditor: -# executor: -# docker: -# image: rubydistros/ubuntu-18.04:2.6 - -# - label: "chef-config Unit :ruby: 2.6" -# commands: -# - /workdir/.expeditor/scripts/bk_container_prep.sh -# - cd chef-config -# - bundle config set --local without omnibus_package -# - bundle config set --local path 'vendor/bundle' -# - bundle install --jobs=3 --retry=3 -# - bundle exec rake spec -# expeditor: -# executor: -# docker: -# image: rubydistros/ubuntu-18.04:2.6 - -######################################################################### # Tests Ruby 3.1 ######################################################################### |