Skip to content

Commit bc06bf5

Browse files
authored
Merge pull request #1497 from puppetlabs/pdksync_pdksync/remove_puppet_module_gems
pdksync - (PDKSync) Removal of puppet_module_gems
2 parents 83fb27d + 8eef398 commit bc06bf5

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

.devcontainer/README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
1313

1414
// Set *default* container specific settings.json values on container create.
1515
"settings": {
16-
"terminal.integrated.shell.linux": "/bin/bash"
16+
"terminal.integrated.profiles.linux": {
17+
"bash": {
18+
"path": "bash",
19+
}
20+
}
1721
},
1822

1923
// Add the IDs of extensions you want installed when the container is created.
2024
"extensions": [
2125
"puppet.puppet-vscode",
2226
"rebornix.Ruby"
23-
]
27+
],
2428

2529
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2630
"forwardPorts": [],

.sync.yml

-8
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,8 @@ Rakefile:
2121
unmanaged: false
2222
.github/workflows/nightly.yml:
2323
unmanaged: false
24-
exclude_platforms:
25-
- Debian-9
26-
- Debian-10
27-
- Debian-11
2824
.github/workflows/pr_test.yml:
2925
unmanaged: false
30-
exclude_platforms:
31-
- Debian-9
32-
- Debian-10
33-
- Debian-11
3426
.github/workflows/auto_release.yml:
3527
unmanaged: false
3628
.github/workflows/spec.yml:

Gemfile

+19-14
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,28 @@ def location_for(place_or_version, fake_version = nil)
1313
end
1414
end
1515

16-
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
17-
minor_version = ruby_version_segments[0..1].join('.')
18-
1916
group :development do
20-
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
24-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
25-
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
26-
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false, platforms: [:ruby]
28-
gem "github_changelog_generator", require: false
17+
gem "json", '~> 2.0', require: false
18+
gem "voxpupuli-puppet-lint-plugins", '~> 3.0', require: false
19+
gem "facterdb", '~> 1.18', require: false
20+
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
21+
gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
22+
gem "rspec-puppet-facts", '~> 2.0', require: false
23+
gem "codecov", '~> 0.2', require: false
24+
gem "dependency_checker", '~> 0.2', require: false
25+
gem "parallel_tests", '~> 3.4', require: false
26+
gem "pry", '~> 0.10', require: false
27+
gem "simplecov-console", '~> 0.5', require: false
28+
gem "puppet-debugger", '~> 1.0', require: false
29+
gem "rubocop", '= 1.6.1', require: false
30+
gem "rubocop-performance", '= 1.9.1', require: false
31+
gem "rubocop-rspec", '= 2.0.1', require: false
32+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
33+
gem "github_changelog_generator", require: false
2934
end
3035
group :system_tests do
31-
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
32-
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
36+
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
37+
gem "serverspec", '~> 2.41', require: false
3338
end
3439

3540
puppet_version = ENV['PUPPET_GEM_VERSION']

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@
8787
],
8888
"description": "MySQL module",
8989
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
90-
"template-ref": "heads/main-0-g806810b",
91-
"pdk-version": "2.4.0"
90+
"template-ref": "tags/2.6.0-0-gd0490b9",
91+
"pdk-version": "2.5.0"
9292
}

0 commit comments

Comments
 (0)