Skip to content

Commit e57c711

Browse files
committed
Update to PDK template 3.0.1
This commit updates this module from PDK template 2.7.1 to 3.0.1. In addition to the boilerplate changes, this commit also: - Updates the "auto release" GitHub Action to "release prep," reflecting upstream change (puppetlabs/pdk-templates@c3f57b7). - Removes the github_changelog_generator and concurrent-ruby gems, which were previously needed for the release process but are no longer necessary in newer release processes in the PDK template.
1 parent 52d8128 commit e57c711

File tree

12 files changed

+271
-178
lines changed

12 files changed

+271
-178
lines changed

.github/workflows/auto_release.yml

Lines changed: 0 additions & 92 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,6 @@ on:
44
workflow_dispatch:
55

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@v4
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@v4
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"

.github/workflows/release_prep.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "Release Prep"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: "Module version to be released. Must be a valid semver string. (1.2.3)"
8+
required: true
9+
10+
jobs:
11+
release_prep:
12+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
13+
with:
14+
version: "${{ github.event.inputs.version }}"
15+
secrets: "inherit"

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

.pdkignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -26,20 +26,17 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
32+
/.github/
3433
/.gitignore
35-
/.gitlab-ci.yml
3634
/.pdkignore
3735
/.puppet-lint.rc
3836
/Rakefile
3937
/rakelib/
4038
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
39+
/..yml
4340
/.yardopts
4441
/spec/
4542
/.vscode/

0 commit comments

Comments
 (0)