Skip to content

Commit 15dea32

Browse files
author
Daniel Carabas
committed
PDK Update for release prep workflow
1 parent 515e623 commit 15dea32

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.github/workflows/auto_release.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
persist-credentials: false
3737

3838
- name: "PDK Release prep"
39-
uses: docker://puppet/pdk:nightly
39+
uses: docker://puppet/iac_release:ci
4040
with:
4141
args: 'release prep --force'
4242
env:
@@ -46,12 +46,12 @@ jobs:
4646
if: ${{ github.repository_owner == 'puppetlabs' }}
4747
id: gv
4848
run: |
49-
echo "::set-output name=ver::$(cat metadata.json | jq .version | tr -d \")"
49+
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
5050
5151
- name: "Commit changes"
5252
if: ${{ github.repository_owner == 'puppetlabs' }}
5353
run: |
54-
git config --local user.email "action@github.com"
54+
git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
5555
git config --local user.name "GitHub Action"
5656
git add .
5757
git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
@@ -66,7 +66,12 @@ jobs:
6666
branch: "release-prep"
6767
delete-branch: true
6868
title: "Release prep v${{ steps.gv.outputs.ver }}"
69-
body: "Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb)"
69+
body: |
70+
Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}.
71+
Please verify before merging:
72+
- [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
73+
- [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
74+
- [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
7075
labels: "maintenance"
7176

7277
- name: PR outputs

.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ tasks:
66

77
vscode:
88
extensions:
9-
- puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
9+
- puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg==

.sync.yml

+2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@ spec/spec_helper.rb:
3131
unmanaged: false
3232
.github/workflows/release.yml:
3333
unmanaged: false
34+
.github/workflows/auto_release.yml:
35+
unmanaged: false
3436
.travis.yml:
3537
delete: true

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"version_requirement": ">= 6.0.0 < 8.0.0"
6464
}
6565
],
66-
"pdk-version": "1.18.1",
66+
"pdk-version": "1.19.0.pre",
6767
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
68-
"template-ref": "heads/main-0-g12a5dea"
68+
"template-ref": "heads/main-0-gce6a88f"
6969
}

0 commit comments

Comments
 (0)