Skip to content

Commit a113659

Browse files
authored
Merge pull request #240 from github/ahayworth-ci-puppet-ruby
Run CI jobs against Puppet 7 and Ruby 3
2 parents 089b699 + acadc74 commit a113659

File tree

4 files changed

+32
-4
lines changed

4 files changed

+32
-4
lines changed

Diff for: .github/workflows/main.yml

+25
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
RSPEC_TEST: true
1010
runs-on: ubuntu-latest
1111
strategy:
12+
fail-fast: false
1213
matrix:
1314
ruby-version: ["2.0", "2.1"]
1415
steps:
@@ -27,6 +28,7 @@ jobs:
2728
RSPEC_TEST: true
2829
runs-on: ubuntu-latest
2930
strategy:
31+
fail-fast: false
3032
matrix:
3133
ruby-version: ["2.1", "2.2", "2.3"]
3234
steps:
@@ -45,6 +47,7 @@ jobs:
4547
RSPEC_TEST: true
4648
runs-on: ubuntu-latest
4749
strategy:
50+
fail-fast: false
4851
matrix:
4952
ruby-version: ["2.4", "2.5", "2.6"]
5053
steps:
@@ -63,6 +66,7 @@ jobs:
6366
RSPEC_TEST: true
6467
runs-on: ubuntu-latest
6568
strategy:
69+
fail-fast: false
6670
matrix:
6771
ruby-version: ["2.5", "2.6"]
6872
steps:
@@ -78,3 +82,24 @@ jobs:
7882
env:
7983
RUBOCOP_TEST: true
8084
ENFORCE_COVERAGE: true
85+
86+
puppet-7-3-0:
87+
env:
88+
PUPPET_VERSIONS: "7.3.0"
89+
PUPPET_VERSION: "7.3.0"
90+
RUBOCOP_TEST: false
91+
RSPEC_TEST: true
92+
runs-on: ubuntu-latest
93+
strategy:
94+
fail-fast: false
95+
matrix:
96+
# 2.7 and 3.0 fail at the moment
97+
# ruby-version: ["2.5", "2.6", "2.7", "3.0"]
98+
ruby-version: ["2.5", "2.6"]
99+
steps:
100+
- name: Checkout code
101+
uses: actions/checkout@v1
102+
- name: Build container
103+
run: docker build . --file Dockerfile --tag octocatalog-diff:ruby${{matrix.ruby-version}} --build-arg RUBY_VERSION=${{matrix.ruby-version}}-buster
104+
- name: Tests
105+
run: docker run -e PUPPET_VERSION -e PUPPET_VERSIONS -e RSPEC_TEST -e RUBOCOP_TEST -e ENFORCE_COVERAGE octocatalog-diff:ruby${{matrix.ruby-version}} /app/script/cibuild

Diff for: config/puppet-versions.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717
{
1818
"minimum_version": "5.0.0",
1919
"maximum_version": "5.99.99",
20-
"additional_gems": [
21-
]
20+
"additional_gems": []
2221
},
2322
{
2423
"minimum_version": "6.0.0",
2524
"maximum_version": "6.99.99",
26-
"additional_gems": [
27-
]
25+
"additional_gems": []
26+
},
27+
{
28+
"minimum_version": "7.0.0",
29+
"maximum_version": "7.99.99",
30+
"additional_gems": []
2831
}
2932
]

Diff for: vendor/cache/puppet-7.3.0.gem

2.68 MB
Binary file not shown.

Diff for: vendor/cache/scanf-1.0.0.gem

12 KB
Binary file not shown.

0 commit comments

Comments
 (0)