Fix to deployment workflow so deployment status attaches to correct commit

Author: webstackdev

.github/workflows/deployment.yml

@@ -24,7 +24,14 @@ jobs:
         uses: actions/github-script@v8
         with:
           script: |
-            const runId = context.payload.workflow_run.id;
+            const workflowRun = context.payload.workflow_run;
+            const headBranch = workflowRun?.head_branch;
+            if (typeof headBranch === 'string' && headBranch.startsWith('hotfix/')) {
+              core.info('hotfix/* branch detected; skipping CI job verification.');
+              return;
+            }
+
+            const runId = workflowRun.id;
             const requiredJobs = ['Lint', 'Unit Tests'];
             const { data } = await github.rest.actions.listJobsForWorkflowRun({
               owner: context.repo.owner,
@@ -70,11 +77,14 @@ jobs:
         id: vercel-preview
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
           vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
           github-comment: false
         env:
           VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
+          GITHUB_SHA: ${{ github.event.workflow_run.head_sha }}
+          GITHUB_REF: refs/heads/${{ github.event.workflow_run.head_branch }}
 
       - name: Comment preview URL on PR
         if: ${{ !startsWith(github.event.workflow_run.head_branch, 'hotfix/') && always() && steps.vercel-preview.outcome == 'success' }}
@@ -285,11 +295,14 @@ jobs:
         id: vercel-production
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-args: '--prod'
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
           vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
         env:
           VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
+          GITHUB_SHA: ${{ github.event.workflow_run.head_sha }}
+          GITHUB_REF: refs/heads/${{ github.event.workflow_run.head_branch }}
 
       - name: Log production deployment
         if: always() && steps.vercel-production.outcome == 'success'

_TODO.md

@@ -222,27 +222,7 @@ The contact data collection uses an array of social networks, with keys:
 
 The authors collection is using named entries under a "social" property, like "twitter", "github", etc. This task is to refactor that to use an array like contact data collection. We also need to add a color for the social network icon, or some other approach to setting the color of it while enabling theming.
 
-## Require successful deployment to merge on GitHub
-
-In branch protection / ruleset for main, add this required status check:
-Deployment / Deploy Preview to Vercel
-
-## Display a system font until font files load (Lighthouse improvements)
-
-Display a system font until font files load to improve FCP (First Contentful Paint) with `font-display: swap`. Need to make sure that web font doesn't render larger or smaller than the system font fallback to avoid CLS (Cumulative Layout Shift) issues.
-
-```css
-@font-face {
-  font-family: 'Pacifico';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Pacifico Regular'), local('Pacifico-Regular'),
-    url(https://fonts.gstatic.com/s/pacifico/v12/FwZY7-Qmy14u9lezJ-6H6MmBp0u-.woff2) format('woff2');
-  font-display: swap;
-}
-```
-
-Preload fonts:
+## Preload fonts:
 
 ```html
 <link rel="preload" as="font" />