From 3a519e2be32578d83f14647fe49963e6e176e6b4 Mon Sep 17 00:00:00 2001
From: Luke Walton <thelukewalton@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:04:54 +0100
Subject: [PATCH] ci: Fix CI branch names (#8)

---
 .github/workflows/build.yml          | 23 ++++++++---------------
 .github/workflows/on-pr.yml          |  2 +-
 .github/workflows/on-release.yml     |  2 +-
 .github/workflows/release-please.yml |  4 ++--
 testFile.txt                         |  0
 5 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100644 testFile.txt

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 26481154..60056dcd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,18 +28,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           ref: ${{github.ref_name}}
-          token: ${{ secrets.PAT }}
-      - name: Check if icon-updates branch exists
-        id: branch-exists
-        run: echo "branch_exists=$(git ls-remote --heads origin refs/heads/${{env.UPDATE_BRANCH_NAME}} | wc -l)" >> $GITHUB_ENV
-      - name: Checkout existing branch
-        if: ${{ env.branch_exists == 1 }}
-        run: git checkout ${{env.UPDATE_BRANCH_NAME}}
-      - name: Checkout new branch
-        if: ${{ env.branch_exists == 0 }}
-        run: git checkout -b ${{env.UPDATE_BRANCH_NAME}}
+      - name: Create new branch name
+        id: "branch_name"
+        run: echo "BRANCH_NAME='${{env.UPDATE_BRANCH_NAME}}-${{github.ref_name}}'" >> $GITHUB_OUTPUT
       - name: Install packages
         run: npm ci
       - name: Compile Typescript files
@@ -58,19 +50,20 @@ jobs:
       - name: Get current date
         if: ${{ steps.fetch_icons.outputs.files_changed  == 'true'}}
         id: date
-        run: echo "::set-output name=date::$(date +'%d-%b-%Y')"
+        run: echo date=$(date +'%d-%b-%Y') >> $GITHUB_OUTPUT
       - name: Push
         if: ${{ steps.fetch_icons.outputs.files_changed  == 'true'}}
         run: |
+          git checkout -b ${{steps.branch_name.outputs.BRANCH_NAME}}
           git config --global user.name "zeta-icons-bot"
           git config --global user.email "zeta-icons-bot@github.com"
           git add -A
           git commit -m "feat: Icon updates ${{ steps.date.outputs.date }}"
-          git push --set-upstream origin ${{env.UPDATE_BRANCH_NAME}}
+          git push --set-upstream origin ${{steps.branch_name.outputs.BRANCH_NAME}} -f
       - name: Check if PR exists
-        run: echo "pr_exists=$(gh pr list -H icon-updates --json number -q length)" >> $GITHUB_ENV
+        run: echo "pr_exists=$(gh pr list -H ${{steps.branch_name.outputs.BRANCH_NAME}} --json number -q length)" >> $GITHUB_ENV
       - name: Create Pull Request
         if: ${{env.pr_exists == 0 && steps.fetch_icons.outputs.files_changed == 'true'}}
-        run: gh pr create -B main -H ${{env.UPDATE_BRANCH_NAME}} --title "feat:${{env.UPDATE_BRANCH_NAME}}" --body 'Created by the Zeta Icons bot'
+        run: gh pr create -B main -H ${{steps.branch_name.outputs.BRANCH_NAME}} --title "feat:${{steps.branch_name.outputs.BRANCH_NAME}}" --body 'Created by the Zeta Icons bot'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml
index 711c62da..96a5ab2b 100644
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -1,4 +1,4 @@
-name: Pull request
+name: CI - Pull Request
 
 on: pull_request
 
diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml
index 5296c4b2..3d1741ad 100644
--- a/.github/workflows/on-release.yml
+++ b/.github/workflows/on-release.yml
@@ -1,4 +1,4 @@
-name: "Release"
+name: CI - On Release
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 8dc67ccc..95b49d32 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -1,3 +1,5 @@
+name: CI - On Main
+
 on:
   push:
     branches:
@@ -7,8 +9,6 @@ permissions:
   contents: write
   pull-requests: write
 
-name: release-please
-
 jobs:
   release-please:
     runs-on: ubuntu-latest
diff --git a/testFile.txt b/testFile.txt
new file mode 100644
index 00000000..e69de29b