Skip to content

Commit 375f8d2

Browse files
authored
Merge pull request #1201 from david22swan/maint/main/max_changelog
(maint) - Set max_issues for changelog generator to 500
2 parents 8b91a30 + fdd5724 commit 375f8d2

File tree

6 files changed

+24
-11
lines changed

6 files changed

+24
-11
lines changed

.github/workflows/auto_release.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,14 @@ jobs:
4646
run: |
4747
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
4848
49-
- name: "Commit changes"
49+
- name: "Check if a release is necessary"
5050
if: ${{ github.repository_owner == 'puppetlabs' }}
51+
id: check
52+
run: |
53+
git diff --quiet CHANGELOG.md && echo "::set-output name=release::false" || echo "::set-output name=release::true"
54+
55+
- name: "Commit changes"
56+
if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
5157
run: |
5258
git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
5359
git config --local user.name "GitHub Action"
@@ -57,7 +63,7 @@ jobs:
5763
- name: Create Pull Request
5864
id: cpr
5965
uses: puppetlabs/peter-evans-create-pull-request@v3
60-
if: ${{ github.repository_owner == 'puppetlabs' }}
66+
if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
6167
with:
6268
token: ${{ secrets.GITHUB_TOKEN }}
6369
commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
@@ -73,7 +79,7 @@ jobs:
7379
labels: "maintenance"
7480

7581
- name: PR outputs
76-
if: ${{ github.repository_owner == 'puppetlabs' }}
82+
if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
7783
run: |
7884
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
7985
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

.github/workflows/pr_test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5252
echo STEP_START=$(date +%s) >> $GITHUB_ENV
5353
54+
- name: Run validation steps
55+
run: |
56+
bundle exec rake validate
57+
if: ${{ github.repository_owner == 'puppetlabs' }}
58+
5459
- name: Setup Acceptance Test Matrix
5560
id: get-matrix
5661
run: |

.github/workflows/spec.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
5656
echo STEP_START=$(date +%s) >> $GITHUB_ENV
5757
58+
- name: Run Static & Syntax Tests
59+
if: ${{ github.repository_owner == 'puppetlabs' }}
60+
run: |
61+
buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
62+
5863
- name: Setup Spec Test Matrix
5964
id: get-matrix
6065
run: |
@@ -120,10 +125,6 @@ jobs:
120125
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
121126
echo ::endgroup::
122127
123-
- name: Run Static & Syntax Tests
124-
run: |
125-
buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
126-
127128
- name: Run parallel_spec tests
128129
run: |
129130
buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec

.sync.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
include_todos: true
66
appveyor.yml:
77
delete: true
8-
8+
Rakefile:
9+
changelog_max_issues: 500
910
Gemfile:
1011
optional:
1112
":development":
@@ -17,7 +18,6 @@ spec/spec_helper.rb:
1718
unmanaged: false
1819
.gitpod.yml:
1920
unmanaged: false
20-
2121
.github/workflows/nightly.yml:
2222
unmanaged: false
2323
.github/workflows/pr_test.yml:

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
4848
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
4949
config.user = "#{changelog_user}"
5050
config.project = "#{changelog_project}"
51+
config.max_issues = 500
5152
config.future_release = "#{changelog_future_release}"
5253
config.exclude_labels = ['maintenance']
5354
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
}
104104
],
105105
"description": "Standard Library for Puppet Modules",
106-
"pdk-version": "2.1.0",
106+
"pdk-version": "2.2.0",
107107
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
108-
"template-ref": "heads/main-0-g03daa92"
108+
"template-ref": "heads/main-0-g51828b4"
109109
}

0 commit comments

Comments
 (0)