Merge branch 'master' into hotfix/ubuntu-puppet-facts

Author: nmaludy

.devcontainer/Dockerfile

@@ -0,0 +1,6 @@
+FROM puppet/pdk:latest
+
+# [Optional] Uncomment this section to install additional packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+

.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+{
+	"name": "Puppet Development Kit (Community)",
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"puppet.puppet-vscode",
+		"rebornix.Ruby"
+	]
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "pdk --version",
+}

.github/workflows/build.yaml

@@ -20,18 +20,18 @@ jobs:
       matrix:
         include:
           # note: actions/setup-ruby only allows using a major.minor release of ruby
-          - ruby: '2.5'
-            puppet: "6.0"
+          - ruby: '2.7'
+            puppet: "7.0"
             check: "check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
             name: 'static'
-          - ruby: '2.4'
-            puppet: "5.0"
-            check: "parallel_spec"
-            name: 'spec'
           - ruby: '2.5'
             puppet: "6.0"
             check: "parallel_spec"
             name: 'spec'
+          - ruby: '2.7'
+            puppet: "7.0"
+            check: "parallel_spec"
+            name: 'spec'
     env:
       CHECK: '${{ matrix.check }}'
       PUPPET_GEM_VERSION: '~> ${{ matrix.puppet }}'
@@ -83,8 +83,8 @@ jobs:
       matrix:
         include:
           # note: actions/setup-ruby only allows using a major.minor release of ruby
-          - ruby: '2.5'
-            puppet: "6.0"
+          - ruby: '2.7'
+            puppet: "7.0"
     env:
       PUPPET_GEM_VERSION: '~> ${{ matrix.puppet }}'
       # lock to 2.1.0 because 2.2.0 is causing issues during builds

.pdkignore

@@ -32,6 +32,7 @@
 /.gitignore
 /.gitlab-ci.yml
 /.pdkignore
+/.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
@@ -40,3 +41,4 @@
 /.yardopts
 /spec/
 /.vscode/
+/.sync.yml