update, remove duplicate site checks

Author: ilikecereal1

.github/workflows/gh-jekyll-workflow.yml

@@ -12,8 +12,6 @@ on:
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: read
-  pages: write
-  id-token: write
 
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
@@ -52,6 +50,9 @@ jobs:
 
   deploy:
     if: ${{ needs.build.result == 'success' }}
+    permissions:
+      pages: write
+      id-token: write
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.github/workflows/site-checks.yml

@@ -590,13 +590,14 @@ def verify_generated_page(route, lang, errors)
 unless missing_deployment_checks.empty?
   errors << "Deployment workflow is missing checks: #{missing_deployment_checks.join(', ')}"
 end
+if deployment_workflow.include?("pull_request:")
+  errors << "Deployment workflow must not duplicate redesign push checks with pull-request checks"
+end
 unless deployment_workflow.include?("needs: build") && deployment_workflow.include?("if: ${{ needs.build.result == 'success' }}")
   errors << "Deployment must require a successful build job"
 end
-
-checks_workflow = File.read(File.join(ROOT, ".github", "workflows", "site-checks.yml"))
-unless checks_workflow.match?(/branches:\s*\[[^\]]*main[^\]]*redesign[^\]]*\]/)
-  errors << "Site checks must run on main and redesign"
+if File.exist?(File.join(ROOT, ".github", "workflows", "site-checks.yml"))
+  errors << "Separate site-check workflow would duplicate pull-request checks"
 end
 
 if File.file?(default_page_file)