Skip to content

Commit 7e0c27d

Browse files
committed
Merge branch '6.x' into maint/7.x/12-28-22_manual_merge_up
Merge conflicts in the workflows files, added silent to what was on the 6.x branch
2 parents 3bf0a59 + 17631bb commit 7e0c27d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Update rubygems and install gems
3636
run: |
37-
gem update --system --silent --no-document
37+
gem update --system 3.3.26 --silent --no-document
3838
bundle config set without packaging documentation
3939
bundle install --jobs 4 --retry 3
4040

.github/workflows/rspec_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Update rubygems and install gems
4040
run: |
41-
gem update --system --silent --no-document
41+
gem update --system 3.3.26 --silent --no-document
4242
bundle config set without packaging documentation
4343
bundle install --jobs 4 --retry 3
4444

0 commit comments

Comments
 (0)