Merge pull request #667 from puppetlabs/maint-update_pdk_release_image

chelnak · web-flow · commit fb212222956f · 2023-02-03T09:45:15.000Z
(maint) - PDK Update
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"settings": {
 		"terminal.integrated.profiles.linux": {
 			"bash": {
-				"path": "bash",
+				"path": "bash"
 			}
 		}
 	},
diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml
@@ -34,7 +34,7 @@ jobs:
         persist-credentials: false
 
     - name: "PDK Release prep"
-      uses: docker://puppet/iac_release:ci
+      uses: docker://puppet/pdk:2.6.1.0
       with:
         args: 'release prep --force'
       env:
diff --git a/Rakefile b/Rakefile
@@ -43,6 +43,7 @@ end
 
 PuppetLint.configuration.send('disable_relative')
 
+
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
diff --git a/metadata.json b/metadata.json
@@ -81,6 +81,6 @@
   ],
   "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Amazon Linux and Gentoo.",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "2.7.1-0-g9a16c87",
-  "pdk-version": "2.5.0"
+  "template-ref": "heads/main-0-g9375381",
+  "pdk-version": "2.6.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"settings": {`
`6`	`6`	`"terminal.integrated.profiles.linux": {`
`7`	`7`	`"bash": {`
`8`		`- "path": "bash",`
	`8`	`+ "path": "bash"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`},`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,6 @@`
`81`	`81`	`],`
`82`	`82`	`"description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Amazon Linux and Gentoo.",`
`83`	`83`	`"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",`
`84`		`- "template-ref": "2.7.1-0-g9a16c87",`
`85`		`- "pdk-version": "2.5.0"`
	`84`	`+ "template-ref": "heads/main-0-g9375381",`
	`85`	`+ "pdk-version": "2.6.1"`
`86`	`86`	`}`