Merge pull request #8851 from luchihoratiu/maint-pin-ruby3-version-gha

(maint) Pin Ruby versions in GHA workflow
puppetlabs · Jan 5, 2022 · 3b8b7ad · 3b8b7ad
2 parents 8aaf57f + be3776c
commit 3b8b7ad
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {check: rubocop, os: ubuntu-18.04, ruby: 2.5}
-          - {check: commits, os: ubuntu-18.04, ruby: 2.5}
-          - {check: warnings, os: ubuntu-18.04, ruby: 2.5}
+          - {check: rubocop,  os: ubuntu-18.04, ruby: '2.5'}
+          - {check: commits,  os: ubuntu-18.04, ruby: '2.5'}
+          - {check: warnings, os: ubuntu-18.04, ruby: '2.5'}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:
@@ -29,9 +29,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.cfg.ruby }}
 
-      - name: Install bundler and gems
+      - name: Update rubygems and install gems
         run: |
-          gem install bundler
+          gem update --system --silent --no-document
           bundle config set without packaging documentation
           bundle install --jobs 4 --retry 3
 

diff --git a/.github/workflows/rspec_tests.yaml b/.github/workflows/rspec_tests.yaml
@@ -13,15 +13,15 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-18.04, ruby: 2.5}
-          - {os: ubuntu-18.04, ruby: 2.6}
-          - {os: ubuntu-18.04, ruby: 2.7}
-          - {os: ubuntu-18.04, ruby: 3.0}
-          - {os: ubuntu-18.04, ruby: jruby-9.2.17.0}
-          - {os: windows-2019, ruby: 2.5}
-          - {os: windows-2019, ruby: 2.6}
-          - {os: windows-2019, ruby: 2.7}
-          - {os: windows-2019, ruby: 3.0}
+          - {os: ubuntu-18.04, ruby: '2.5'}
+          - {os: ubuntu-18.04, ruby: '2.6'}
+          - {os: ubuntu-18.04, ruby: '2.7'}
+          - {os: ubuntu-18.04, ruby: '3.0'}
+          - {os: ubuntu-18.04, ruby: 'jruby-9.2.17.0'}
+          - {os: windows-2019, ruby: '2.5'}
+          - {os: windows-2019, ruby: '2.6'}
+          - {os: windows-2019, ruby: '2.7'}
+          - {os: windows-2019, ruby: '3.0'}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:
@@ -33,9 +33,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.cfg.ruby }}
 
-      - name: Install bundler and gems
+      - name: Update rubygems and install gems
         run: |
-          gem install bundler
+          gem update --system --silent --no-document
           bundle config set without packaging documentation
           bundle install --jobs 4 --retry 3
 

diff --git a/Gemfile b/Gemfile
@@ -26,7 +26,7 @@ group(:features) do
   #gem 'ruby-shadow', '~> 2.5', require: false, platforms: [:ruby]
   gem 'minitar', '~> 0.9', require: false
   gem 'msgpack', '~> 1.2', require: false
-  gem 'rdoc', '~> 6.0', require: false, platforms: [:ruby]
+  gem 'rdoc', ['~> 6.0', '< 6.4.0'], require: false, platforms: [:ruby]
   # requires native augeas headers/libs
   # gem 'ruby-augeas', require: false, platforms: [:ruby]
   # requires native ldap headers/libs