From b61546fc1ac12b3e58a23693821bcf30f3474e57 Mon Sep 17 00:00:00 2001
From: James Henry <james@henry.sc>
Date: Fri, 14 Jun 2024 16:14:45 +0400
Subject: [PATCH] chore(repo): remove pnpm cache from data step, improve
 messages (#26552)

---
 .github/workflows/publish.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0a65bd050e..c4782d7b24 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
     inputs:
       pr:
-        description: "If set, a real release will be created for the branch associated with the given PR number. If blank, a dry-run of the currently selected branch will be performed."
+        description: "PR Number - If set, a real release will be created for the branch associated with the given PR number. If blank, a dry-run of the currently selected branch will be performed."
         required: false
         type: number
   release:
@@ -68,7 +68,6 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
           check-latest: true
-          cache: 'pnpm'
 
       # Ensure that the NPM_TOKEN secret is still valid before wasting any time deriving data or building projects
       - name: Check NPM Credentials
@@ -109,7 +108,7 @@ jobs:
           FILE_TO_COMPARE: "scripts/nx-release.ts"
         run: |
           if ! cmp -s "latest-master-checkout/${{ env.FILE_TO_COMPARE }}" "pr-branch-checkout/${{ env.FILE_TO_COMPARE }}"; then
-            echo "🛑 Error: The file ${{ env.FILE_TO_COMPARE }} is different on the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} vs latest master on nrwl/nx, cancelling workflow."
+            echo "🛑 Error: The file ${{ env.FILE_TO_COMPARE }} is different on the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} vs latest master on nrwl/nx, cancelling workflow. If you did not modify the file, then you likely just need to rebase/merge latest master."
             exit 1
           else
             echo "✅ The file ${{ env.FILE_TO_COMPARE }} is identical between the ${{ steps.script.outputs.ref }} branch on ${{ steps.script.outputs.repo }} and latest master on nrwl/nx."