Skip to content

Commit 3b8b7ad

Browse files
authored
Merge pull request #8851 from luchihoratiu/maint-pin-ruby3-version-gha
(maint) Pin Ruby versions in GHA workflow
2 parents 8aaf57f + be3776c commit 3b8b7ad

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.github/workflows/checks.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
strategy:
1414
matrix:
1515
cfg:
16-
- {check: rubocop, os: ubuntu-18.04, ruby: 2.5}
17-
- {check: commits, os: ubuntu-18.04, ruby: 2.5}
18-
- {check: warnings, os: ubuntu-18.04, ruby: 2.5}
16+
- {check: rubocop, os: ubuntu-18.04, ruby: '2.5'}
17+
- {check: commits, os: ubuntu-18.04, ruby: '2.5'}
18+
- {check: warnings, os: ubuntu-18.04, ruby: '2.5'}
1919

2020
runs-on: ${{ matrix.cfg.os }}
2121
steps:
@@ -29,9 +29,9 @@ jobs:
2929
with:
3030
ruby-version: ${{ matrix.cfg.ruby }}
3131

32-
- name: Install bundler and gems
32+
- name: Update rubygems and install gems
3333
run: |
34-
gem install bundler
34+
gem update --system --silent --no-document
3535
bundle config set without packaging documentation
3636
bundle install --jobs 4 --retry 3
3737

.github/workflows/rspec_tests.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
strategy:
1414
matrix:
1515
cfg:
16-
- {os: ubuntu-18.04, ruby: 2.5}
17-
- {os: ubuntu-18.04, ruby: 2.6}
18-
- {os: ubuntu-18.04, ruby: 2.7}
19-
- {os: ubuntu-18.04, ruby: 3.0}
20-
- {os: ubuntu-18.04, ruby: jruby-9.2.17.0}
21-
- {os: windows-2019, ruby: 2.5}
22-
- {os: windows-2019, ruby: 2.6}
23-
- {os: windows-2019, ruby: 2.7}
24-
- {os: windows-2019, ruby: 3.0}
16+
- {os: ubuntu-18.04, ruby: '2.5'}
17+
- {os: ubuntu-18.04, ruby: '2.6'}
18+
- {os: ubuntu-18.04, ruby: '2.7'}
19+
- {os: ubuntu-18.04, ruby: '3.0'}
20+
- {os: ubuntu-18.04, ruby: 'jruby-9.2.17.0'}
21+
- {os: windows-2019, ruby: '2.5'}
22+
- {os: windows-2019, ruby: '2.6'}
23+
- {os: windows-2019, ruby: '2.7'}
24+
- {os: windows-2019, ruby: '3.0'}
2525

2626
runs-on: ${{ matrix.cfg.os }}
2727
steps:
@@ -33,9 +33,9 @@ jobs:
3333
with:
3434
ruby-version: ${{ matrix.cfg.ruby }}
3535

36-
- name: Install bundler and gems
36+
- name: Update rubygems and install gems
3737
run: |
38-
gem install bundler
38+
gem update --system --silent --no-document
3939
bundle config set without packaging documentation
4040
bundle install --jobs 4 --retry 3
4141

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ group(:features) do
2626
#gem 'ruby-shadow', '~> 2.5', require: false, platforms: [:ruby]
2727
gem 'minitar', '~> 0.9', require: false
2828
gem 'msgpack', '~> 1.2', require: false
29-
gem 'rdoc', '~> 6.0', require: false, platforms: [:ruby]
29+
gem 'rdoc', ['~> 6.0', '< 6.4.0'], require: false, platforms: [:ruby]
3030
# requires native augeas headers/libs
3131
# gem 'ruby-augeas', require: false, platforms: [:ruby]
3232
# requires native ldap headers/libs

0 commit comments

Comments
 (0)