From b4ea2e3c2fc7534af9245033a2aa604794f358f7 Mon Sep 17 00:00:00 2001
From: Victoria <32179813+victoriafomina@users.noreply.github.com>
Date: Fri, 14 Oct 2022 08:40:55 +0300
Subject: [PATCH 1/4] Add minor release versions

---
 .../publish-plugin-and-cli-from-branch.yml        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml
index e9bdb161d6..a8dd43a23c 100644
--- a/.github/workflows/publish-plugin-and-cli-from-branch.yml
+++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml
@@ -11,6 +11,16 @@ on:
 
   workflow_dispatch:
     inputs:
+        minor-release:
+          type: choice
+          description: "It adds alpha or beta postfix to version."
+          required: false
+          options:
+          - "1"
+          - "2"
+          - "3"
+          - "4"
+
         version-postfix:
           type: choice
           description: "It adds alpha or beta postfix to version."
@@ -49,6 +59,11 @@ jobs:
         run: |
           echo "VERSION="$(date +%Y).$(date +%-m)"" >> $GITHUB_ENV
 
+      - name: Set version for minor release
+        if: ${{ github.event.inputs.minor-release != '' }}
+        run: |
+          echo "VERSION=${{ env.VERSION }}.${{ github.event.inputs.minor-release }}" >> $GITHUB_ENV
+
       - name: Create version with postfix
         if: ${{ (env.POSTFIX == 'alpha') || (env.POSTFIX == 'beta') }}
         run:

From 79663b26b047e87008927263085290eed22819df Mon Sep 17 00:00:00 2001
From: Victoria <32179813+victoriafomina@users.noreply.github.com>
Date: Fri, 14 Oct 2022 08:43:32 +0300
Subject: [PATCH 2/4] Fix minor version

---
 .../workflows/publish-plugin-and-cli-from-branch.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml
index a8dd43a23c..fa201f95b5 100644
--- a/.github/workflows/publish-plugin-and-cli-from-branch.yml
+++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml
@@ -14,12 +14,14 @@ on:
         minor-release:
           type: choice
           description: "It adds alpha or beta postfix to version."
-          required: false
+          required: true
+          default: ''
           options:
-          - "1"
-          - "2"
-          - "3"
-          - "4"
+          - ''
+          - '1'
+          - '2'
+          - '3'
+          - '4'
 
         version-postfix:
           type: choice

From 563939a3d51709f54940dd9d56e7516b03c1078b Mon Sep 17 00:00:00 2001
From: Victoria <32179813+victoriafomina@users.noreply.github.com>
Date: Fri, 14 Oct 2022 08:46:19 +0300
Subject: [PATCH 3/4] Fix minor release indicators

---
 .github/workflows/publish-plugin-and-cli-from-branch.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml
index fa201f95b5..f61e50d9a2 100644
--- a/.github/workflows/publish-plugin-and-cli-from-branch.yml
+++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml
@@ -13,11 +13,11 @@ on:
     inputs:
         minor-release:
           type: choice
-          description: "It adds alpha or beta postfix to version."
+          description: "It adds minor release indicator to version."
           required: true
           default: ''
           options:
-          - ''
+          - 'none'
           - '1'
           - '2'
           - '3'
@@ -62,7 +62,7 @@ jobs:
           echo "VERSION="$(date +%Y).$(date +%-m)"" >> $GITHUB_ENV
 
       - name: Set version for minor release
-        if: ${{ github.event.inputs.minor-release != '' }}
+        if: ${{ github.event.inputs.minor-release != 'none' }}
         run: |
           echo "VERSION=${{ env.VERSION }}.${{ github.event.inputs.minor-release }}" >> $GITHUB_ENV
 

From 2614ee8bdad046dfa831d11ca940a5730ae5277d Mon Sep 17 00:00:00 2001
From: Victoria <32179813+victoriafomina@users.noreply.github.com>
Date: Fri, 14 Oct 2022 10:21:26 +0300
Subject: [PATCH 4/4] Fix a bug with none

---
 .github/workflows/publish-plugin-and-cli-from-branch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml
index f61e50d9a2..72449e2ab3 100644
--- a/.github/workflows/publish-plugin-and-cli-from-branch.yml
+++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml
@@ -15,7 +15,7 @@ on:
           type: choice
           description: "It adds minor release indicator to version."
           required: true
-          default: ''
+          default: 'none'
           options:
           - 'none'
           - '1'