Skip to content

Commit b743ebe

Browse files
authored
Merge pull request #390 from puppetlabs/CONT-807-add_ruby_3
(CONT-807) Add Ruby 3.2 support
2 parents 6d49745 + 47d5298 commit b743ebe

File tree

17 files changed

+195
-569
lines changed

17 files changed

+195
-569
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
ruby_version:
19-
- '2.5'
2019
- '2.7'
21-
- '3.0'
22-
- '3.1'
20+
- '3.2'
2321
include:
24-
- ruby_version: '2.5'
25-
puppet_gem_version: '~> 6.0'
2622
- ruby_version: '2.7'
2723
puppet_gem_version: '~> 7.0'
28-
- ruby_version: '3.0'
29-
puppet_gem_version: '~> 7.0'
30-
- ruby_version: '3.1'
31-
puppet_gem_version: '~> 7.0'
24+
- ruby_version: '3.2'
25+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8
3226
name: "spec (ruby ${{ matrix.ruby_version }} | puppet ${{ matrix.puppet_gem_version }})"
3327
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
3428
secrets: "inherit"
@@ -42,12 +36,11 @@ jobs:
4236
fail-fast: false
4337
matrix:
4438
ruby_version:
45-
- "2.5"
46-
- "2.7"
47-
- '3.0'
48-
- '3.1'
39+
- '2.7'
40+
- '3.2'
4941
name: "acceptance (ruby ${{ matrix.ruby_version }})"
5042
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
5143
secrets: "inherit"
5244
with:
5345
ruby_version: ${{ matrix.ruby_version }}
46+
puppet_version: ${{ matrix.puppet_version }}

.github/workflows/nightly.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,13 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
ruby_version:
15-
- '2.5'
1615
- '2.7'
17-
- '3.0'
18-
- '3.1'
16+
- '3.2'
1917
include:
20-
- ruby_version: '2.5'
21-
puppet_gem_version: '~> 6.0'
2218
- ruby_version: '2.7'
2319
puppet_gem_version: '~> 7.0'
24-
- ruby_version: '3.0'
25-
puppet_gem_version: '~> 7.0'
26-
- ruby_version: '3.1'
27-
puppet_gem_version: '~> 7.0'
20+
- ruby_version: '3.2'
21+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8
2822
name: "spec (ruby ${{ matrix.ruby_version }} | puppet ${{ matrix.puppet_gem_version }})"
2923
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
3024
secrets: "inherit"
@@ -38,12 +32,11 @@ jobs:
3832
fail-fast: false
3933
matrix:
4034
ruby_version:
41-
- "2.5"
42-
- "2.7"
43-
- '3.0'
44-
- '3.1'
35+
- '2.7'
36+
- '3.2'
4537
name: "acceptance (ruby ${{ matrix.ruby_version }})"
4638
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
4739
secrets: "inherit"
4840
with:
4941
ruby_version: ${{ matrix.ruby_version }}
42+
puppet_gem_version: ${{ matrix.puppet_gem_version }}

0 commit comments

Comments
 (0)