Skip to content

Commit 5222a3e

Browse files
Merge pull request #390 from puppetlabs/pdksync_pdkupdate
pdksync - (maint) pdksync - PDK Update
2 parents 939f5cd + 8bbc876 commit 5222a3e

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

.github/workflows/auto_release.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: "Auto release"
22

33
on:
4-
schedule:
5-
- cron: '0 3 * * 6'
64
workflow_dispatch:
75

86
env:

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
ref: ${{ github.ref }}
3939
clean: true
4040
- name: "PDK Build"
41-
uses: docker://puppet/pdk:2.1.0.0
41+
uses: docker://puppet/pdk:nightly
4242
with:
4343
args: 'build'
4444
- name: "Push to Forge"
45-
uses: docker://puppet/pdk:2.1.0.0
45+
uses: docker://puppet/pdk:nightly
4646
with:
4747
args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'

.github/workflows/spec.yml

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
env:
8484
BUILDEVENT_FILE: '../buildevents.txt'
8585
PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
86+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
8687

8788
steps:
8889
- run: |

.pdkignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
2929
/appveyor.yml
30+
/.editorconfig
3031
/.fixtures.yml
3132
/Gemfile
3233
/.gitattributes

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"tsql",
4848
"database"
4949
],
50-
"pdk-version": "2.0.0",
50+
"pdk-version": "2.1.0",
5151
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
52-
"template-ref": "heads/main-0-ge04486b"
52+
"template-ref": "heads/main-0-g03daa92"
5353
}

spec/spec_helper.rb

+12
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@
4848
c.after(:suite) do
4949
RSpec::Puppet::Coverage.report!(0)
5050
end
51+
52+
# Filter backtrace noise
53+
backtrace_exclusion_patterns = [
54+
%r{spec_helper},
55+
%r{gems},
56+
]
57+
58+
if c.respond_to?(:backtrace_exclusion_patterns)
59+
c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
60+
elsif c.respond_to?(:backtrace_clean_patterns)
61+
c.backtrace_clean_patterns = backtrace_exclusion_patterns
62+
end
5163
end
5264

5365
# Ensures that a module is defined

0 commit comments

Comments
 (0)