Commit 2d399f54 authored by Nathan Ward's avatar Nathan Ward
Browse files

Update to pdk 2.4.0

parent 5bebc7c1

.devcontainer/README.md

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# devcontainer





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

 

``` json

{

	"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",

}

```

.devcontainer/devcontainer.json

+5 −11
Original line number Diff line number Diff line 
// 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"

		"terminal.integrated.profiles.linux": {

			"bash": {

				"path": "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",

}

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -25,3 +25,4 @@ 
.project

.envrc

/inventory.yaml

/spec/fixtures/litmus_inventory.yaml

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ default: 
    - bundle -v

    - bundle install --without system_tests --path vendor/bundle --jobs $(nproc)



syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.7-Puppet ~> 6:

validate lint check rubocop-Ruby 2.5.7-Puppet ~> 6:

  stage: syntax

  image: ruby:2.5.7

  script:

    - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop

    - bundle exec rake validate lint check rubocop

  variables:

    PUPPET_GEM_VERSION: '~> 6'
@@ -35,11 +35,11 @@ parallel_spec-Ruby 2.5.7-Puppet ~> 6: 
  variables:

    PUPPET_GEM_VERSION: '~> 6'



syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.7.2-Puppet ~> 7:

validate lint check rubocop-Ruby 2.7.2-Puppet ~> 7:

  stage: syntax

  image: ruby:2.7.2

  script:

    - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop

    - bundle exec rake validate lint check rubocop

  variables:

    PUPPET_GEM_VERSION: '~> 7'

.pdkignore

+2 −0
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 
.project

.envrc

/inventory.yaml

/spec/fixtures/litmus_inventory.yaml

/appveyor.yml

/.editorconfig

/.fixtures.yml

/Gemfile

/.gitattributes