Skip to content

Commit d7b64c2

Browse files
authored
Merge pull request #430 from puppetlabs/CONT-800-add_puppet8_support
(CONT-800) - Add Puppet 8/Drop Puppet 6
2 parents 83d0998 + e1fc3af commit d7b64c2

Some content is hidden

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

63 files changed

+689
-948
lines changed

.fixtures.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fixtures:
33
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
44
puppet_agent:
55
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
6-
ref: v4.12.1
6+
ref: v4.13.0
77
provision: 'https://github.com/puppetlabs/provision.git'
88
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
99
mount_iso: 'https://github.com/puppetlabs/puppetlabs-mount_iso.git'

.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/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ jobs:
5757
fail-fast: false
5858
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
5959

60+
env:
61+
PUPPET_GEM_VERSION: '~> 7.24'
62+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
63+
6064
steps:
6165
- name: Checkout Source
6266
uses: actions/checkout@v2

.github/workflows/nightly.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ jobs:
5555
fail-fast: false
5656
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
5757

58+
env:
59+
PUPPET_GEM_VERSION: '~> 7.24'
60+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
61+
5862
steps:
5963
- name: Checkout Source
6064
uses: actions/checkout@v2

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