Skip to content

Commit 3a8eb58

Browse files
Add RockyLinux 8 support (#99)
1 parent 2480e85 commit 3a8eb58

File tree

6 files changed

+22
-9
lines changed

6 files changed

+22
-9
lines changed

.github/workflows/pr_tests.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,16 @@ jobs:
109109
strategy:
110110
matrix:
111111
puppet:
112-
- label: 'Puppet 7.x'
113-
puppet_version: '~> 7.21.0'
112+
- label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
113+
puppet_version: '~> 7.0'
114114
ruby_version: '2.7'
115+
experimental: false
115116
- label: 'Puppet 8.x'
116117
puppet_version: '~> 8.0'
117-
ruby_version: '3.2'
118+
ruby_version: 3.1
119+
experimental: true
118120
env:
119-
PUPPET_VERSION: '${{matrix.puppet.puppet_version}}'
121+
PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
120122
steps:
121123
- uses: actions/checkout@v3
122124
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
@@ -126,6 +128,8 @@ jobs:
126128
bundler-cache: true
127129
- run: 'command -v rpm || if command -v apt-get; then sudo apt-get update; sudo apt-get install -y rpm; fi ||:'
128130
- run: 'bundle exec rake spec'
131+
continue-on-error: ${{matrix.puppet.experimental}}
132+
fail-fast: false
129133

130134
# dump_contexts:
131135
# name: 'Examine Context contents'

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ pup7.pe-unit:
340340
<<: *pup_7_pe
341341
<<: *unit_tests
342342

343+
# Commenting until Puppet 8 is released
343344
#pup8.x-unit:
344345
# <<: *pup_8_x
345346
# <<: *unit_tests

.puppet-lint.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
--no-class_inherits_from_params_class-check
1010
--no-140chars-check
1111
--no-trailing_comma-check
12-
--no-empty_string_assignment-check
12+
--no-params-empty-string-assignment-check
1313
# This is here because the code can't handle lookups in parameters and SIMP
1414
# modules have a LOT of those
1515
--no-parameter_order-check

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Mon Jul 24 2023 Chris Tessmer <chris.tessmer@onyxpoint.com> - 6.7.0
2+
- Add RockyLinux 8 support
3+
14
* Fri Jun 03 2022 Chris Tessmer <chris.tessmer@onyxpoint.com> - 6.6.0
25
- Update from camptocamp/systemd to puppet/systemd
36

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ group :test do
2121
gem 'puppetlabs_spec_helper'
2222
gem 'metadata-json-lint'
2323
gem 'puppet-strings'
24-
gem 'puppet-lint-empty_string-check', :require => false
2524
gem 'puppet-lint-trailing_comma-check', :require => false
2625
gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
2726
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.12.1', '< 6']

metadata.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simp-aide",
3-
"version": "6.6.0",
3+
"version": "6.7.0",
44
"author": "SIMP Team",
55
"summary": "manages AIDE",
66
"license": "Apache-2.0",
@@ -14,15 +14,15 @@
1414
"dependencies": [
1515
{
1616
"name": "puppet/systemd",
17-
"version_requirement": ">= 3.0.0 < 4.0.0"
17+
"version_requirement": ">= 4.0.2 < 6.0.0"
1818
},
1919
{
2020
"name": "simp/simplib",
2121
"version_requirement": ">= 4.9.0 < 5.0.0"
2222
},
2323
{
2424
"name": "puppetlabs/stdlib",
25-
"version_requirement": ">= 6.6.0 < 8.0.0"
25+
"version_requirement": ">= 8.0.0 < 9.0.0"
2626
},
2727
{
2828
"name": "puppetlabs/concat",
@@ -66,6 +66,12 @@
6666
"7",
6767
"8"
6868
]
69+
},
70+
{
71+
"operatingsystem": "Rocky",
72+
"operatingsystemrelease": [
73+
"8"
74+
]
6975
}
7076
],
7177
"requirements": [

0 commit comments

Comments
 (0)