Skip to content

Commit e884afd

Browse files
authored
Merge pull request #192 from puppetlabs/CONT-794-add_puppet8_support
(CONT-794) - Add Puppet 8/Drop Puppet 6
2 parents c72a941 + a6f210d commit e884afd

File tree

13 files changed

+79
-481
lines changed

13 files changed

+79
-481
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"settings": {
66
"terminal.integrated.profiles.linux": {
77
"bash": {
8-
"path": "bash",
8+
"path": "bash"
99
}
1010
}
1111
},

.fixtures.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ fixtures:
44
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
55
puppet_agent:
66
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
7-
ref: v4.12.1
7+
ref: v4.13.0
88
provision: 'https://github.com/puppetlabs/provision.git'
99
symlinks:
10-
"puppet_conf": "#{source_dir}"
10+
"puppet_conf": "#{source_dir}"

.github/workflows/auto_release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ on:
55

66
jobs:
77
release_prep:
8-
name: "Release Prep"
98
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
109
secrets: "inherit"

.github/workflows/nightly.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ on:
88
jobs:
99
Spec:
1010
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11-
with:
12-
runs_on: "ubuntu-20.04"
1311
secrets: "inherit"
1412

1513
Acceptance:
1614
needs: Spec
1715
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
18-
with:
19-
runs_on: "ubuntu-20.04"
2016
secrets: "inherit"
21-

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

0 commit comments

Comments
 (0)