diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-09-16 16:12:33 +0600 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-09-22 11:15:00 +0600 |
| commit | 5aacd12f8b95ee21e095f4e8b053a1e73fd66065 (patch) | |
| tree | f7fc11251a69e09ed62e5403352082b7f8b1ec6f | |
| parent | f10135cc57cf80dae6f95d085b514d4105a8f241 (diff) | |
| download | chef-5aacd12f8b95ee21e095f4e8b053a1e73fd66065.tar.gz | |
Refactoring to remove adding the updated bundler
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | .github/workflows/kitchen.yml | 33 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 18 insertions, 17 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 68b49726d8..87acb4a2b1 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -176,21 +176,21 @@ jobs: linux: strategy: fail-fast: false - matrix: - os: - - 'amazonlinux-2' - - 'centos-6' - - 'centos-7' - - 'almalinux-8' - - 'debian-9' - - 'debian-10' - - 'debian-11' - - 'fedora-latest' - - 'opensuse-leap-15' - - 'ubuntu-1804' - - 'ubuntu-2004' - - 'ubuntu-2204' - ruby: ['3.1'] + # matrix: + # os: + # - 'amazonlinux-2' + # - 'centos-6' + # - 'centos-7' + # - 'almalinux-8' + # - 'debian-9' + # - 'debian-10' + # - 'debian-11' + # - 'fedora-latest' + # - 'opensuse-leap-15' + # - 'ubuntu-1804' + # - 'ubuntu-2004' + # - 'ubuntu-2204' + # ruby: ['3.1'] runs-on: ubuntu-latest env: FORCE_FFI_YAJL: ext @@ -201,7 +201,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.1" + ruby-version: '3.1' bundler-cache: false working-directory: kitchen-tests - name: Run Test Kitchen @@ -212,6 +212,7 @@ jobs: which ruby cd /home/runner/work/chef/chef bundle install + gem install bundler:2.3.7 gem install kitchen cd /home/runner/work/chef/chef/kitchen-tests bundle install diff --git a/Gemfile.lock b/Gemfile.lock index 18487630b5..0e6e3fab7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -446,4 +446,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.18 + 2.3.7 |