Skip to content

Commit 0f92a5b

Browse files
committed
(maint) Merge up b7cb119 to main
Merge conflicts around the ubuntu 18.08 -> latest Generated by me * 6.x: (packaging) Updating manpage file for 6.x (PUP-11626) Update Ubuntu GitHub Action runners
2 parents 04cf2ae + b7cb119 commit 0f92a5b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/checks.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
strategy:
1717
matrix:
1818
cfg:
19-
- {check: rubocop, os: ubuntu-18.04, ruby: '2.5'}
20-
- {check: commits, os: ubuntu-18.04, ruby: '2.5'}
21-
- {check: warnings, os: ubuntu-18.04, ruby: '2.5'}
19+
- {check: rubocop, os: ubuntu-latest, ruby: 2.5}
20+
- {check: commits, os: ubuntu-latest, ruby: 2.5}
21+
- {check: warnings, os: ubuntu-latest, ruby: 2.5}
2222

2323
runs-on: ${{ matrix.cfg.os }}
2424
steps:

.github/workflows/rspec_tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
strategy:
1717
matrix:
1818
cfg:
19-
- {os: ubuntu-18.04, ruby: '2.5'}
20-
- {os: ubuntu-18.04, ruby: '2.6'}
21-
- {os: ubuntu-18.04, ruby: '2.7'}
22-
- {os: ubuntu-18.04, ruby: '3.0'}
23-
- {os: ubuntu-18.04, ruby: 'jruby-9.2.17.0'}
19+
- {os: ubuntu-latest, ruby: '2.5'}
20+
- {os: ubuntu-latest, ruby: '2.6'}
21+
- {os: ubuntu-latest, ruby: '2.7'}
22+
- {os: ubuntu-latest, ruby: '3.0'}
23+
- {os: ubuntu-latest, ruby: 'jruby-9.2.17.0'}
2424
- {os: windows-2019, ruby: '2.5'}
2525
- {os: windows-2019, ruby: '2.6'}
2626
- {os: windows-2019, ruby: '2.7'}

0 commit comments

Comments
 (0)