From 37fbd08e89ddcc9ab24408db75cda67b085a9404 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Thu, 28 Oct 2021 16:26:06 +0300
Subject: [PATCH] update release configuration

---
 .github/release-drafter.yml         | 25 -------------------------
 .github/release.yml                 | 22 ++++++++++++++++++++++
 .github/workflows/release-draft.yml | 14 --------------
 .github/workflows/release.yml       | 23 ++++++++---------------
 4 files changed, 30 insertions(+), 54 deletions(-)
 delete mode 100644 .github/release-drafter.yml
 create mode 100644 .github/release.yml
 delete mode 100644 .github/workflows/release-draft.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
deleted file mode 100644
index c17d77dbe..000000000
--- a/.github/release-drafter.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name-template: '$NEXT_MINOR_VERSION'
-tag-template: '$NEXT_MINOR_VERSION'
-categories:
-  - title: '🚀 New Features'
-    labels:
-      - 'type:new feature'
-  - title: '🔬 Improvements'
-    labels:
-      - 'type:improvement'
-  - title: '🐞 Bug Fixes'
-    labels:
-      - 'type:bug'
-  - title: '⬆️ Dependency Updates'
-    labels:
-      - 'type:dependencies'
-
-change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR'
-exclude-labels:
-  - 'type:internal'
-template: |
-  $CHANGES
-
-  ## 👀 Links
-
-  [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure-java/compare/$PREVIOUS_TAG...master)
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..c382d697b
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,22 @@
+# release.yml
+
+changelog:
+  categories:
+    - title: '🚀 New Features'
+      labels:
+        - 'type:new feature'
+    - title: '🔬 Improvements'
+      labels:
+        - 'type:improvement'
+    - title: '🐞 Bug Fixes'
+      labels:
+        - 'type:bug'
+    - title: '⬆️ Dependency Updates'
+      labels:
+        - 'type:dependencies'
+    - title: '⛔️ Security'
+      labels:
+        - 'type:security'
+    - title: '👻 Internal changes'
+      labels:
+        - 'type:internal'
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
deleted file mode 100644
index ea9ee55ca..000000000
--- a/.github/workflows/release-draft.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Release Draft
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  update_draft_release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: toolmantim/release-drafter@v5.15.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0623733b1..52a66524b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,11 +17,9 @@ jobs:
       - name: "Check release version"
         run: |
           expr "${{ github.event.inputs.releaseVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-
       - name: "Check next version"
         run: |
           expr "${{ github.event.inputs.nextVersion }}" : '[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*$'
-
       - uses: actions/checkout@v2.3.5
         with:
           token: ${{ secrets.QAMETA_CI }}
@@ -30,34 +28,29 @@ jobs:
         run: |
           git config --global user.name qameta-ci
           git config --global user.email qameta-ci@qameta.io
-
-      - name: "Set release version in gradle.properties file"
+      - name: "Set release version"
         run: |
           sed -i -e '/version=/s/.*/version=${{ github.event.inputs.releaseVersion }}/g' gradle.properties
           cat gradle.properties
-
       - name: "Commit release version and create tag"
         run: |
           git commit -am "release ${{ github.event.inputs.releaseVersion }}"
           git tag ${{ github.event.inputs.releaseVersion }}
           git push origin ${{ github.event.inputs.releaseVersion }}
-
-      - name: "Set next development version in gradle.properties file"
+      - name: "Set next development version"
         run: |
           sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties
           cat gradle.properties
-
       - name: "Commit next development version and push it"
         run: |
           git commit -am "set next development version ${{ github.event.inputs.nextVersion }}"
-          git push origin ${GITHUB_REF}
-
+          git push origin ${{ github.ref }}
       - name: "Publish Github Release"
-        uses: toolmantim/release-drafter@v5.15.0
+        uses: octokit/request-action@v2.x
         with:
-          tag: ${{ github.event.inputs.releaseVersion }}
-          publish: "true"
-          version: ${{ github.event.inputs.releaseVersion }}
+          route: POST /repos/${{ github.repository }}/releases
+          tag_name: ${{ github.event.inputs.releaseVersion }}
+          generate_release_notes: true
+          target_commitish: ${{ github.ref }}
         env:
           GITHUB_TOKEN: ${{ secrets.QAMETA_CI }}
-