From 0c15a46defc5708246254bb5d59dd2ce710c11a1 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Mon, 15 Jul 2024 19:54:09 -0400
Subject: [PATCH] Review feedback

---
 .github/workflows/publish-docs.yml | 16 ++++++----------
 .gitignore                         |  3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index a9ce3cecf92b..67bfffde026c 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -20,9 +20,6 @@ on:
 jobs:
   mkdocs:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
@@ -39,7 +36,7 @@ jobs:
           version="${{ (inputs.plan != '' && fromJson(inputs.plan).announcement_tag) || inputs.ref }}"
           # if version is missing, exit with error
           if [[ -z "$version" ]]; then
-          echo "Can't build versioned docs without a version!"
+          echo "Can't build docs without a version."
           exit 1
           fi
 
@@ -90,15 +87,15 @@ jobs:
           git clone https://${{ secrets.ASTRAL_DOCS_PAT }}@github.com/astral-sh/docs.git astral-docs
 
       - name: "Copy docs"
-        run: rm -rf astral-docs/site/uv && mkdir -p astral-docs/site && cp -r site/uv astral-docs/site/uv
+        run: rm -rf astral-docs/site/uv && mkdir -p astral-docs/site && cp -r site/uv astral-docs/site/
 
       - name: "Commit docs"
         working-directory: astral-docs
         run: |
           branch_name="${{ env.branch_name }}"
 
-          git config user.name "GitHub Actions Bot"
-          git config user.email "github-actions-bot@example.com"
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
           git checkout -b $branch_name
           git add uv
@@ -106,6 +103,8 @@ jobs:
 
       - name: "Create Pull Request"
         working-directory: astral-docs
+        env:
+          GITHUB_TOKEN: ${{ secrets.ASTRAL_DOCS_PAT }}
         run: |
           version="${{ env.version }}"
           display_name="${{ env.display_name }}"
@@ -123,9 +122,6 @@ jobs:
           # push the branch to GitHub
           git push origin $branch_name
 
-          # authenticate with GitHub
-          echo ${{ secrets.ASTRAL_DOCS_PAT}} | gh auth login --with-token
-
           # create the PR
           gh pr create --base main --head $branch_name \
             --title "$pull_request_title" \
diff --git a/.gitignore b/.gitignore
index 1a106a64e912..47b09fb4a091 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ flamegraph.svg
 perf.data
 perf.data.old
 profile.json
+
+# MkDocs
+site