added new flow

deckhouse · Jan 30, 2025 · 7fc0471 · 7fc0471
1 parent a3d811e
commit 7fc0471
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/.github/scripts/python/create_release.py b/.github/scripts/python/create_release.py
@@ -1,4 +1,5 @@
 import os
+import semver
 import requests
 
 
@@ -7,7 +8,6 @@
 REPO_NAME = os.getenv("REPO_NAME")
 ACCESS_TOKEN = os.getenv("ACCESS_TOKEN")
 TAG_NAME = os.getenv("TAG_NAME")
-RELEASE_BRANCH = os.getenv("RELEASE_BRANCH")
 RELEASE_NAME = f"{TAG_NAME} Deckhouse Kubernetes Platform"
 RELEASE_BODY = os.getenv("RELEASE_BODY")
 MILESTONE_TITLE = os.getenv("MILESTONE_TITLE")
@@ -44,11 +44,12 @@ def create_github_release():
         "Authorization": f"Bearer {ACCESS_TOKEN}",
         "Accept": "application/vnd.github.v3+json"
     }
-
+    version = semver.VersionInfo.parse(TAG_NAME[1:])  # Убираем 'v' перед парсингом
+    release_branch =f"release-{version.minor}"
     url = f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/releases"
     data = {
         "tag_name": TAG_NAME,
-        "target_commitish": RELEASE_BRANCH,
+        "target_commitish": release_branch,
         "name": RELEASE_NAME,
         "body": f"{RELEASE_BODY}",
         "draft": DRAFT,

diff --git a/.github/workflow_templates/create_realese.yml b/.github/workflow_templates/create_realese.yml
@@ -20,10 +20,6 @@ on:
       tag_name:
         description: 'Tag name for the release (e.g., v1.0.0)'
         required: true
-      release_branch: 
-        description: 'Release branch for the release (e.g., release-1.67.9)'
-        required: true
-
 jobs:
   create-release:
     permissions: write-all
@@ -58,7 +54,6 @@ jobs:
           REPO_NAME: ${{ github.event.repository.name }}
           ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG_NAME: ${{ github.event.inputs.tag_name }}
-          RELEASE_BRANCH: ${{ github.event.inputs.release_branch }}
           RELEASE_BODY: ${{ steps.changelog.outputs.release_markdown }}
           MILESTONE_TITLE: ${{ github.event.inputs.tag_name }}
         shell: bash

diff --git a/.github/workflows/create_realese.yml b/.github/workflows/create_realese.yml
@@ -24,10 +24,6 @@ on:
       tag_name:
         description: 'Tag name for the release (e.g., v1.0.0)'
         required: true
-      release_branch: 
-        description: 'Release branch for the release (e.g., release-1.67.9)'
-        required: true
-
 jobs:
   create-release:
     permissions: write-all
@@ -67,7 +63,6 @@ jobs:
           REPO_NAME: ${{ github.event.repository.name }}
           ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG_NAME: ${{ github.event.inputs.tag_name }}
-          RELEASE_BRANCH: ${{ github.event.inputs.release_branch }}
           RELEASE_BODY: ${{ steps.changelog.outputs.release_markdown }}
           MILESTONE_TITLE: ${{ github.event.inputs.tag_name }}
         shell: bash