Merge pull request #100 from Keyfactor/use-release_version-for-pr-title

Use release version for pr title
Keyfactor · Jul 24, 2024 · 8335ec5 · 8335ec5
2 parents a2b9f6e + 7a6e1da
commit 8335ec5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/kf-post-release.yml b/.github/workflows/kf-post-release.yml
@@ -10,10 +10,10 @@ on:
         description: Release branch tag being merged to main
         required: true
         type: string
-      # release_version:
-      #   description: Release branch tag being merged to main
-      #   required: true
-      #   type: string
+      release_version:
+        description: Release branch tag being merged to main
+        required: true
+        type: string
 
 jobs:
   create-pr-to-main:
@@ -38,5 +38,5 @@ jobs:
           source_branch: ${{ inputs.branchname }}
           target_branch: main
           allow_no_diff: true
-          title: Merge ${{ inputs.branchname }} to main
+          title: Merge ${{ inputs.release_version }} to main
           body: "Merge ${{ inputs.branchname }} to main - Automated PR"
diff --git a/.github/workflows/starter.yml b/.github/workflows/starter.yml
@@ -159,9 +159,9 @@ jobs:
   call-post-release-workflow:
    needs: [call-assign-from-json-workflow, call-create-github-release-workflow]
    if: needs.call-create-github-release-workflow.outputs.IS_FULL_RELEASE == 'True'
-   uses: Keyfactor/actions/.github/workflows/kf-post-release.yml@v3
+   uses: Keyfactor/actions/.github/workflows/kf-post-release.yml@use-release_version-for-pr-title
    secrets: 
      token: ${{ secrets.token }}
    with:
      branchname: ${{ github.event.pull_request.base.ref }}
-#     release_version: ${{ needs.call-create-github-release-workflow.outputs.PR_BASE_TAG }}
+     release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}