Skip to content

Commit 95d663a

Browse files
committed
(CDPE-7363) Modernize with pdk 3.6.1
This module is based on a very old version of the pdk. This uses pdk update with pdk 3.6.1 to modernize it
1 parent 7cf3a98 commit 95d663a

11 files changed

Lines changed: 818 additions & 438 deletions

File tree

.github/workflows/release.yml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,8 @@ name: "Publish module"
22

33
on:
44
workflow_dispatch:
5-
5+
66
jobs:
7-
create-github-release:
8-
name: Deploy GitHub Release
9-
runs-on: ubuntu-20.04
10-
steps:
11-
- name: Checkout code
12-
uses: actions/checkout@v2
13-
with:
14-
ref: ${{ github.ref }}
15-
clean: true
16-
fetch-depth: 0
17-
- name: Get Version
18-
id: gv
19-
run: |
20-
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
21-
- name: Create Release
22-
uses: actions/create-release@v1
23-
id: create_release
24-
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
with:
27-
tag_name: "v${{ steps.gv.outputs.ver }}"
28-
draft: false
29-
prerelease: false
30-
31-
deploy-forge:
32-
name: Deploy to Forge
33-
runs-on: ubuntu-20.04
34-
steps:
35-
- name: Checkout code
36-
uses: actions/checkout@v2
37-
with:
38-
ref: ${{ github.ref }}
39-
clean: true
40-
- name: "PDK Build"
41-
uses: docker://puppet/pdk:nightly
42-
with:
43-
args: 'build'
44-
- name: "Push to Forge"
45-
uses: docker://puppet/pdk:nightly
46-
with:
47-
args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
7+
release:
8+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
9+
secrets: "inherit"

.gitignore

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
/pkg/
1818
/spec/fixtures/manifests/
1919
/spec/fixtures/modules/*
20-
!/spec/fixtures/modules/cd4pe_test_tasks
21-
/spec/fixtures/puppet-enterprise-modules
22-
/spec/fixtures/secrets/*
23-
!/spec/fixtures/secrets/README.md
24-
inventory.yaml
2520
/tmp/
2621
/vendor/
27-
.vendor/
28-
.vscode/
29-
.ruby-version
22+
/.vendor/
3023
/convert_report.txt
3124
/update_report.txt
3225
.DS_Store
33-
target/*
34-
test/params.json
35-
params.json
26+
.project
27+
.envrc
28+
/inventory.yaml
29+
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log

.pdkignore

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,36 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
20-
/spec/fixtures/puppet-enterprise-modules/
19+
/spec/fixtures/modules/*
2120
/tmp/
2221
/vendor/
22+
/.vendor/
2323
/convert_report.txt
2424
/update_report.txt
2525
.DS_Store
26-
/checkouts/
27-
/dev-resources
28-
/src/
29-
/target/
30-
/test/
31-
/dev/
32-
.vendor
33-
project.clj
34-
RELEASE.md
26+
.project
27+
.envrc
28+
/inventory.yaml
29+
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log
36+
/.fixtures.yml
37+
/Gemfile
38+
/.gitattributes
39+
/.github/
40+
/.gitignore
41+
/.pdkignore
42+
/.puppet-lint.rc
43+
/Rakefile
44+
/rakelib/
45+
/.rspec
46+
/..yml
47+
/.yardopts
48+
/spec/
49+
/.vscode/
50+
/.sync.yml
51+
/.devcontainer/

.puppet-lint.rc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
--fail-on-warnings
2+
--relative
3+
--no-80chars-check
4+
--no-140chars-check
5+
--no-class_inherits_from_params_class-check
6+
--no-autoloader_layout-check
7+
--no-documentation-check
8+
--no-single_quote_string_with_variables-check
9+
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp

0 commit comments

Comments
 (0)