From f390df64b591573492cd2e4330f900ed3a8a8dfb Mon Sep 17 00:00:00 2001
From: David Byron <82477955+dbyron-sf@users.noreply.github.com>
Date: Fri, 31 Mar 2023 20:32:05 -0700
Subject: [PATCH 1/2] chore(gha): replace action for creating github releases
 (#5929)

see https://github.com/spinnaker/rosco/pull/966 for background

(cherry picked from commit 5c8426dedb4835151141791770f64f6b0116d0e0)

# Conflicts:
#	.github/workflows/release.yml
---
 .github/workflows/release.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 30c40a632ae..048795f1687 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -110,13 +110,23 @@ jobs:
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
       - name: Create release
         if: steps.release_info.outputs.SKIP_RELEASE == 'false'
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.event.repository.name }} ${{ github.ref }}
           body: |
             ${{ steps.release_info.outputs.CHANGELOG }}
           draft: false
+          name: ${{ github.event.repository.name }} ${{ github.ref_name }}
           prerelease: ${{ steps.release_info.outputs.IS_CANDIDATE }}
+<<<<<<< HEAD
+=======
+          tag_name: ${{ github.ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Pause before dependency bump
+        run: sleep 900
+      - name: Trigger dependency bump workflow
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.SPINNAKER_GITHUB_TOKEN }}
+          event-type: bump-dependencies
+          client-payload: '{"ref": "${{ github.ref }}"}'
+>>>>>>> 5c8426ded (chore(gha): replace action for creating github releases (#5929))

From c3b871183aa3d190d04cc56c1cfe9c686f8f1a19 Mon Sep 17 00:00:00 2001
From: David Byron <dbyron@salesforce.com>
Date: Thu, 7 Sep 2023 19:04:39 -0700
Subject: [PATCH 2/2] chore(gha): resolve conflicts

---
 .github/workflows/release.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 048795f1687..b9b1efdc43e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -117,16 +117,5 @@ jobs:
           draft: false
           name: ${{ github.event.repository.name }} ${{ github.ref_name }}
           prerelease: ${{ steps.release_info.outputs.IS_CANDIDATE }}
-<<<<<<< HEAD
-=======
           tag_name: ${{ github.ref }}
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pause before dependency bump
-        run: sleep 900
-      - name: Trigger dependency bump workflow
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.SPINNAKER_GITHUB_TOKEN }}
-          event-type: bump-dependencies
-          client-payload: '{"ref": "${{ github.ref }}"}'
->>>>>>> 5c8426ded (chore(gha): replace action for creating github releases (#5929))