Skip to content

Commit 86a2f64

Browse files
author
Andreas Stuerz
committed
Merge remote-tracking branch 'origin/main' into main
2 parents 0e08ccd + 18779db commit 86a2f64

File tree

6 files changed

+29
-10
lines changed

6 files changed

+29
-10
lines changed

.github/workflows/auto_release.yml

+9-3
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 }}"

.sync.yml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ spec/spec_helper.rb:
1313
- require 'spec_helper_local'
1414
coverage_report: true
1515
"  changelog_user": puppetlabs
16+
Rakefile:
17+
changelog_max_issues: 500
1618
.gitpod.Dockerfile:
1719
unmanaged: false
1820
.gitpod.yml:

CHANGELOG.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22

33
All 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).
44

5-
## [v12.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.0) (2021-07-26)
5+
## [v12.0.1](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.1) (2021-08-26)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v12.0.0...v12.0.1)
8+
9+
### Fixed
10+
11+
- \(IAC-1741\) Allow stdlib v8.0.0 [\#1433](https://github.com/puppetlabs/puppetlabs-mysql/pull/1433) ([david22swan](https://github.com/david22swan))
12+
- MODULES-8373 Fix mysql\_grant resource to be idempodent on MySQL 8+ [\#1427](https://github.com/puppetlabs/puppetlabs-mysql/pull/1427) ([theq86](https://github.com/theq86))
13+
14+
## [v12.0.0](https://github.com/puppetlabs/puppetlabs-mysql/tree/v12.0.0) (2021-07-27)
615

716
[Full Changelog](https://github.com/puppetlabs/puppetlabs-mysql/compare/v11.1.0...v12.0.0)
817

REFERENCE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ Hash a string as mysql's "PASSWORD()" function would do it
15561556

15571557
#### `mysql::password(Variant[String, Sensitive[String]] $password, Optional[Boolean] $sensitive)`
15581558

1559-
The mysql::password function.
1559+
Hash a string as mysql's "PASSWORD()" function would do it
15601560

15611561
Returns: `Variant[String, Sensitive[String]]` hash
15621562
The mysql password hash from the clear text password.

Rakefile

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
4949
config.user = "#{changelog_user}"
5050
config.project = "#{changelog_project}"
5151
config.since_tag = "v11.0.3"
52+
config.max_issues = 500
5253
config.future_release = "#{changelog_future_release}"
5354
config.exclude_labels = ['maintenance']
5455
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

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-mysql",
3-
"version": "12.0.0",
3+
"version": "12.0.1",
44
"author": "puppetlabs",
55
"summary": "Installs, configures, and manages the MySQL service.",
66
"license": "Apache-2.0",
@@ -10,7 +10,7 @@
1010
"dependencies": [
1111
{
1212
"name": "puppetlabs/stdlib",
13-
"version_requirement": ">= 3.2.0 < 8.0.0"
13+
"version_requirement": ">= 3.2.0 < 9.0.0"
1414
}
1515
],
1616
"operatingsystem_support": [
@@ -55,7 +55,8 @@
5555
"operatingsystem": "Ubuntu",
5656
"operatingsystemrelease": [
5757
"16.04",
58-
"18.04"
58+
"18.04",
59+
"20.04"
5960
]
6061
}
6162
],
@@ -67,6 +68,6 @@
6768
],
6869
"description": "MySQL module",
6970
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
70-
"template-ref": "heads/main-0-g2381db6",
71-
"pdk-version": "2.1.0"
71+
"template-ref": "heads/main-0-g51828b4",
72+
"pdk-version": "2.2.0"
7273
}

0 commit comments

Comments
 (0)