Merge 1cd3fb9 into 41084c6

.github/workflows/kf-post-release.yml

@@ -5,6 +5,11 @@ on:
       token:
         description: token
         required: true
+    inputs:
+      branchname:
+        description: Release branch tag being merged to main
+        required: true
+        type: string
 
 jobs:
   clean-releases:
@@ -13,4 +18,13 @@ jobs:
       - name: Remove prereleases
         uses: Keyfactor/action-delete-prereleases@v1.0
         with:
-          repo-token: ${{ secrets.V2BUILDTOKEN }}
+          token: ${{ secrets.token }}
+
+      - name: Create PR to main
+        uses: Keyfactor/action-pull-request@v0.5.5
+        with:
+          token: ${{ secrets.token }}
+          source_branch: ${{ inputs.branchname }}
+          target_branch: main
+          title: Merge ${{ inputs.branchname }} to main
+          body: "Merge ${{ inputs.branchname }} to main - Automated PR"

.github/workflows/starter.yml

@@ -156,10 +156,12 @@ jobs:
     secrets:
       token: ${{ secrets.scan_token }}
 
-  #call-post-release-cleanup-workflow:
-  #  needs: [call-dotnet-build-and-release-workflow, 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@v2
-  #  secrets: 
-  #    token: ${{ secrets.token }}
+  call-post-release-cleanup-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@post-release-tasks_ab#56816
+   secrets: 
+     token: ${{ secrets.token }}
+   with:
+     branchname: ${{ github.event.pull_request.head.ref }}