Skip to content

Commit 9b9b063

Browse files
author
jordanbreen28
committed
(maint) - PDK Update
This commit contains changes made by running pdk update.
1 parent 7f0f868 commit 9b9b063

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"settings": {
66
"terminal.integrated.profiles.linux": {
77
"bash": {
8-
"path": "bash",
8+
"path": "bash"
99
}
1010
}
1111
},

‎.github/workflows/auto_release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
echo STEP_START=$(date +%s) >> $GITHUB_ENV
2929
- name: "Checkout Source"
3030
if: ${{ github.repository_owner == 'puppetlabs' }}
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3232
with:
3333
fetch-depth: 0
3434
persist-credentials: false
3535

3636
- name: "PDK Release prep"
37-
uses: docker://puppet/iac_release:ci
37+
uses: docker://puppet/pdk:2.6.1.0
3838
with:
3939
args: 'release prep --force'
4040
env:

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-20.04
1010
steps:
1111
- name: Checkout code
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
ref: ${{ github.ref }}
1515
clean: true
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-20.04
3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v2
36+
uses: actions/checkout@v3
3737
with:
3838
ref: ${{ github.ref }}
3939
clean: true

‎.github/workflows/spec.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo STEP_ID=setup-environment >> $GITHUB_ENV
3333
echo STEP_START=$(date +%s) >> $GITHUB_ENV
3434
- name: Checkout Source
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3636
if: ${{ github.repository_owner == 'puppetlabs' }}
3737

3838
- name: Activate Ruby 2.7
@@ -106,7 +106,7 @@ jobs:
106106
job-status: ${{ job.status }}
107107
matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
108108
- name: Checkout Source
109-
uses: actions/checkout@v2
109+
uses: actions/checkout@v3
110110

111111
- name: "Activate Ruby ${{ matrix.ruby_version }}"
112112
uses: ruby/setup-ruby@v1

‎Gemfile‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
17-
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))
18-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19-
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20-
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "voxpupuli-puppet-lint-plugins", '~> 3.1', require: false
23-
gem "facterdb", '~> 1.18', require: false
24-
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
25-
gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
26-
gem "rspec-puppet-facts", '~> 2.0', require: false
27-
gem "codecov", '~> 0.2', require: false
28-
gem "dependency_checker", '~> 0.2', require: false
29-
gem "parallel_tests", '~> 3.4', require: false
30-
gem "pry", '~> 0.10', require: false
31-
gem "simplecov-console", '~> 0.5', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
33-
gem "rubocop", '= 1.6.1', require: false
34-
gem "rubocop-performance", '= 1.9.1', require: false
35-
gem "rubocop-rspec", '= 2.0.1', require: false
36-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "ruby-pwsh", require: false
38-
gem "github_changelog_generator", '= 1.15.2', require: false
17+
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))
18+
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19+
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20+
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21+
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22+
gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
23+
gem "facterdb", '~> 1.18', require: false
24+
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
25+
gem "puppetlabs_spec_helper", '~> 5.0', require: false
26+
gem "rspec-puppet-facts", '~> 2.0', require: false
27+
gem "codecov", '~> 0.2', require: false
28+
gem "dependency_checker", '~> 0.2', require: false
29+
gem "parallel_tests", '~> 3.4', require: false
30+
gem "pry", '~> 0.10', require: false
31+
gem "simplecov-console", '~> 0.5', require: false
32+
gem "puppet-debugger", '~> 1.0', require: false
33+
gem "rubocop", '= 1.6.1', require: false
34+
gem "rubocop-performance", '= 1.9.1', require: false
35+
gem "rubocop-rspec", '= 2.0.1', require: false
36+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
gem "ruby-pwsh", require: false
38+
gem "github_changelog_generator", '= 1.15.2', require: false
3939
end
4040
group :system_tests do
41-
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
41+
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
4242
gem "serverspec", '~> 2.41', require: false
4343
end
4444

‎metadata.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
"sql2014",
4545
"sql2016",
4646
"sql2017",
47-
"sql2019",
47+
"sql2019",
4848
"sql2022",
4949
"tsql",
5050
"database"
5151
],
52-
"pdk-version": "2.5.0",
52+
"pdk-version": "2.6.1",
5353
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
54-
"template-ref": "2.7.1-0-g9a16c87"
54+
"template-ref": "heads/main-0-g6e2b72d"
5555
}

0 commit comments

Comments
 (0)