Skip to content

Commit 6beaa30

Browse files
Merge pull request #348 from puppetlabs/CONT-812-ruby_3
(CONT-812) Puppet 8 / Ruby 3 support
2 parents 4ad650d + fc22265 commit 6beaa30

File tree

86 files changed

+866
-1691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+866
-1691
lines changed

.fixtures.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ fixtures:
33
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
44
provision: 'https://github.com/puppetlabs/provision.git'
55
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
6-
symlinks: []
6+
symlinks:
7+
test: "#{source_dir}/spec/fixtures/acceptance/modules/test"

.github/workflows/ci.yml

+36-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,53 @@
11
name: "ci"
22

33
on:
4-
schedule:
5-
- cron: "0 0 * * *"
4+
pull_request:
5+
branches:
6+
- "main"
67
workflow_dispatch:
78

89
jobs:
9-
1010
spec:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
ruby_version:
15+
- "2.7"
16+
- "3.2"
17+
include:
18+
- ruby-version: '2.7'
19+
puppet_gem_version: '~> 7.0'
20+
- ruby_version: '3.2'
21+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
22+
runs_on:
23+
- "ubuntu-latest"
24+
- "windows-latest"
25+
name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
1126
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
1227
secrets: "inherit"
28+
with:
29+
ruby_version: ${{ matrix.ruby_version }}
30+
puppet_gem_version: ${{ matrix.puppet_gem_version }}
31+
runs_on: ${{ matrix.runs_on }}
1332

1433
acceptance:
1534
needs: "spec"
1635
strategy:
1736
matrix:
18-
puppet:
19-
- "puppet6"
20-
- "puppet7"
37+
ruby_version:
38+
- "2.7"
39+
- "3.2"
40+
include:
41+
- ruby-version: '2.7'
42+
puppet_gem_version: '~> 7.0'
43+
- ruby_version: '3.2'
44+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
45+
runs_on:
46+
- "ubuntu-latest"
47+
- "windows-latest"
2148
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
2249
secrets: "inherit"
2350
with:
24-
puppet_version: ${{ matrix.puppet }}
51+
ruby_version: ${{ matrix.ruby_version }}
52+
puppet_version: ${{ matrix.puppet_gem_version }}
53+
runs_on: ${{ matrix.runs_on }}

.github/workflows/nightly.yml

+35-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,52 @@
11
name: "nightly"
22

33
on:
4-
pull_request:
5-
branches:
6-
- "main"
4+
schedule:
5+
- cron: "0 0 * * *"
76
workflow_dispatch:
87

98
jobs:
10-
119
spec:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
ruby_version:
14+
- "2.7"
15+
- "3.2"
16+
include:
17+
- ruby-version: '2.7'
18+
puppet_gem_version: '~> 7.0'
19+
- ruby_version: '3.2'
20+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
21+
runs_on:
22+
- "ubuntu-latest"
23+
- "windows-latest"
24+
name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
1225
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
1326
secrets: "inherit"
27+
with:
28+
ruby_version: ${{ matrix.ruby_version }}
29+
puppet_gem_version: ${{ matrix.puppet_gem_version }}
30+
runs_on: ${{ matrix.runs_on }}
1431

1532
acceptance:
1633
needs: "spec"
1734
strategy:
1835
matrix:
19-
puppet:
20-
- "puppet6"
21-
- "puppet7"
36+
ruby_version:
37+
- "2.7"
38+
- "3.2"
39+
include:
40+
- ruby-version: '2.7'
41+
puppet_gem_version: '~> 7.0'
42+
- ruby_version: '3.2'
43+
puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
44+
runs_on:
45+
- "ubuntu-latest"
46+
- "windows-latest"
2247
uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
2348
secrets: "inherit"
2449
with:
25-
puppet_version: ${{ matrix.puppet }}
50+
ruby_version: ${{ matrix.ruby_version }}
51+
puppet_version: ${{ matrix.puppet_gem_version }}
52+
runs_on: ${{ matrix.runs_on }}

0 commit comments

Comments
 (0)