From 984eeb1af3ec028fb067b46db97eae3565da0223 Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Thu, 19 Oct 2023 16:57:39 +0100
Subject: [PATCH 1/2] Fix automation for updating builder lifecycle version

Sets `GH_TOKEN` when calling `gh release view`, otherwise it returns
an empty payload (but still exits zero, sigh).

Also adjusts the PR creation step name to make it clearer that PRs
are also updated too.

GUS-W-14329446.
---
 .github/workflows/update-lifecycle.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-lifecycle.yml b/.github/workflows/update-lifecycle.yml
index 3a3461a9..55d2092a 100644
--- a/.github/workflows/update-lifecycle.yml
+++ b/.github/workflows/update-lifecycle.yml
@@ -32,14 +32,16 @@ jobs:
       - name: Determine latest lifecycle version
         id: latest-version
         run: echo "version=$(gh release view --repo buildpacks/lifecycle --json tagName --jq '.tagName | sub("v"; "")')" >> "${GITHUB_OUTPUT}"
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.app_token }}
 
       - name: Update builder manifests with latest lifecycle version
         # This only updates manifests that were on the same version as builder-22, to ensure
         # that any legacy builder images pinned to older lifecycle versions are not updated too.
         run: sed --in-place --expression 's/^version = "${{ steps.existing-version.outputs.version }}"$/version = "${{ steps.latest-version.outputs.version }}"/' */builder.toml
 
-      # This step will skip creating a PR if there are no changes to commit.
-      - name: Create pull request
+      # Note: This step will skip creating a PR if there are no changes to commit.
+      - name: Create or update pull request
         id: pr
         uses: peter-evans/create-pull-request@v5.0.2
         with:

From 170c0378ca891cea8a5be6e6579b4fbb53ce4e33 Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Thu, 19 Oct 2023 17:02:46 +0100
Subject: [PATCH 2/2] Set an explicit `ref` for checkout too

Since this makes development easier, since when triggering a manual
workflow_dispatch for a non-main branch, the newly opened PR
will still target main.
---
 .github/workflows/update-lifecycle.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/update-lifecycle.yml b/.github/workflows/update-lifecycle.yml
index 55d2092a..ac246d7c 100644
--- a/.github/workflows/update-lifecycle.yml
+++ b/.github/workflows/update-lifecycle.yml
@@ -21,6 +21,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          # We always want the version bump and resultant PR to target main, not the branch of the workflow_dispatch.
+          ref: main
           token: ${{ steps.generate-token.outputs.app_token }}
 
       - name: Record existing lifecycle version