Skip to content

Commit ab8b9b2

Browse files
authored
Merge pull request puppetlabs#633 from david22swan/CONT-786/main/puppet_8
(CONT-786) Add Support for Puppet 8 / Drop Support for Puppet 6
2 parents 0da3b14 + f456cbc commit ab8b9b2

File tree

561 files changed

+35860
-42914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

561 files changed

+35860
-42914
lines changed

.fixtures.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fixtures:
1313
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
1414
puppet_agent:
1515
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
16-
ref: v4.12.1
16+
ref: v4.13.0
1717
provision: 'https://github.com/puppetlabs/provision.git'
1818
yumrepo_core:
1919
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-20.04
1717
strategy:
1818
fail-fast: false
19-
matrix: {'platform':['centos-7'],'collection':['puppet6-nightly', 'puppet7-nightly']}
19+
matrix: {'platform':['centos-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}
2020

2121
steps:
2222
- name: Checkout Source

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-20.04
1515
strategy:
1616
fail-fast: false
17-
matrix: {'platform':['centos-7'],'collection':['puppet6-nightly', 'puppet7-nightly']}
17+
matrix: {'platform':['centos-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}
1818

1919
steps:
2020
- name: Checkout Source

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
release:
8-
name: "Release"
7+
release:
98
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
109
secrets: "inherit"

.pdkignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,16 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
3432
/.gitignore
35-
/.gitlab-ci.yml
3633
/.pdkignore
3734
/.puppet-lint.rc
3835
/Rakefile
3936
/rakelib/
4037
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
38+
/..yml
4339
/.yardopts
4440
/spec/
4541
/.vscode/

0 commit comments

Comments
 (0)