From e185418975abe95356642d75e9431d968108ef06 Mon Sep 17 00:00:00 2001 From: Daniel Carabas Date: Mon, 7 Jun 2021 13:07:16 +0300 Subject: [PATCH] (maint) pdksync - PDK Update --- .github/workflows/auto_release.yml | 2 -- .github/workflows/release.yml | 4 ++-- .github/workflows/spec.yml | 1 + .pdkignore | 1 + metadata.json | 4 ++-- spec/spec_helper.rb | 12 ++++++++++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto_release.yml b/.github/workflows/auto_release.yml index d15d148..e028483 100644 --- a/.github/workflows/auto_release.yml +++ b/.github/workflows/auto_release.yml @@ -1,8 +1,6 @@ name: "Auto release" on: - schedule: - - cron: '0 3 * * 6' workflow_dispatch: env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76cf31c..1509f6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,10 +38,10 @@ jobs: ref: ${{ github.ref }} clean: true - name: "PDK Build" - uses: docker://puppet/pdk:2.1.0.0 + uses: docker://puppet/pdk:nightly with: args: 'build' - name: "Push to Forge" - uses: docker://puppet/pdk:2.1.0.0 + uses: docker://puppet/pdk:nightly with: args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force' diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index 03e2cb8..16f9316 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -83,6 +83,7 @@ jobs: env: BUILDEVENT_FILE: '../buildevents.txt' PUPPET_GEM_VERSION: ${{ matrix.puppet_version }} + FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' steps: - run: | diff --git a/.pdkignore b/.pdkignore index 33a1347..c538bea 100644 --- a/.pdkignore +++ b/.pdkignore @@ -27,6 +27,7 @@ /inventory.yaml /spec/fixtures/litmus_inventory.yaml /appveyor.yml +/.editorconfig /.fixtures.yml /Gemfile /.gitattributes diff --git a/metadata.json b/metadata.json index 5cb1dc4..6b19765 100644 --- a/metadata.json +++ b/metadata.json @@ -39,6 +39,6 @@ } ], "template-url": "https://github.com/puppetlabs/pdk-templates.git#main", - "template-ref": "heads/main-0-ge04486b", - "pdk-version": "2.0.0" + "template-ref": "heads/main-0-g03daa92", + "pdk-version": "2.1.0" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 16764b6..07db734 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -48,6 +48,18 @@ RSpec.configure do |c| c.after(:suite) do RSpec::Puppet::Coverage.report!(0) end + + # Filter backtrace noise + backtrace_exclusion_patterns = [ + %r{spec_helper}, + %r{gems}, + ] + + if c.respond_to?(:backtrace_exclusion_patterns) + c.backtrace_exclusion_patterns = backtrace_exclusion_patterns + elsif c.respond_to?(:backtrace_clean_patterns) + c.backtrace_clean_patterns = backtrace_exclusion_patterns + end end # Ensures that a module is defined -- 2.32.3