From e93505b297b7a06254612a785a10cde119e1cfe8 Mon Sep 17 00:00:00 2001
From: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
Date: Wed, 11 May 2022 23:13:51 -0400
Subject: [PATCH] Fix changelog workflow (#69)

* fix signoff

* fix imported gpg key attributes propagation

* cleanup
---
 .github/workflows/generate_changelog.yml | 13 +++++++------
 CHANGELOG.md                             |  8 --------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml
index a84b4bad..cfe582f3 100644
--- a/.github/workflows/generate_changelog.yml
+++ b/.github/workflows/generate_changelog.yml
@@ -3,13 +3,13 @@ name: Generate CHANGELOG
 on:
 
   pull_request:
-    types: [closed]
+    types: [ closed ]
 
   release:
-    types: [published]
+    types: [ published ]
 
   issues:
-    types: [closed, edited]
+    types: [ closed, edited ]
 
   workflow_dispatch:
 
@@ -23,6 +23,7 @@ jobs:
           token: ${{ secrets.BOT_TOKEN }}
 
       - name: Import GPG key
+        id: import_gpg_key
         uses: crazy-max/ghaction-import-gpg@v2
         with:
           git_commit_gpgsign: true
@@ -43,6 +44,6 @@ jobs:
           branch: main
           file_pattern: CHANGELOG.md
           push_options: --force
-          commit_author: ${{ steps.import_gpg.outputs.name }} <${{ steps.import_gpg.outputs.email }}>
-          commit_user_email: ${{ steps.import_gpg.outputs.email }}
-          commit_user_name: ${{ steps.import_gpg.outputs.name }}
\ No newline at end of file
+          commit_author: ${{ steps.import_gpg_key.outputs.name }} <${{ steps.import_gpg_key.outputs.email }}>
+          commit_user_email: ${{ steps.import_gpg_key.outputs.email }}
+          commit_user_name: ${{ steps.import_gpg_key.outputs.name }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c49ef3..d50f3f15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,5 @@
 # Changelog
 
-## [Unreleased](https://github.com/bpg/terraform-provider-proxmox/tree/HEAD)
-
-[Full Changelog](https://github.com/bpg/terraform-provider-proxmox/compare/v0.5.2...HEAD)
-
-ENHANCEMENTS:
-
-- Use bot account for changelog generation [\#68](https://github.com/bpg/terraform-provider-proxmox/pull/68) ([bpg](https://github.com/bpg))
-
 ## [v0.5.2](https://github.com/bpg/terraform-provider-proxmox/tree/v0.5.2) (2022-05-10)
 
 [Full Changelog](https://github.com/bpg/terraform-provider-proxmox/compare/v0.5.1...v0.5.2)