Merge pull request #589 from puppetlabs/maint-update_pdk_release_image

pmcmaw · web-flow · commit 568eabd7b0d2 · 2023-01-31T15:45:18.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/metadata.json b/metadata.json
@@ -80,6 +80,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "2.7.1-0-g9a16c87",
-  "pdk-version": "2.6.0"
+  "template-ref": "heads/main-0-gd3a41f4",
+  "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
`@@ -80,6 +80,6 @@`
`80`	`80`	`}`
`81`	`81`	`],`
`82`	`82`	`"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",`
`83`		`- "template-ref": "2.7.1-0-g9a16c87",`
`84`		`- "pdk-version": "2.6.0"`
	`83`	`+ "template-ref": "heads/main-0-gd3a41f4",`
	`84`	`+ "pdk-version": "2.6.1"`
`85`	`85`	`}`