From 79aa308dd3ef0cc3c3cfa56fb11123eb8f8c4e1c Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sat, 8 May 2021 07:09:29 -0400
Subject: [PATCH 01/30] Add workflow to automate docs generation

---
 .github/workflows/generate-docs.yml | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/workflows/generate-docs.yml

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
new file mode 100644
index 00000000000..26529f73037
--- /dev/null
+++ b/.github/workflows/generate-docs.yml
@@ -0,0 +1,63 @@
+name: Plugin Documentation
+
+on:
+  workflow_dispatch:
+
+env:
+  BRANCH_NAME: update/docs
+
+jobs:
+  generate_docs:
+    name: 'Generate documentation'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Detect if PR already exists
+        id: detect_pr
+        run: echo ::set-output name=exists::$(gh api --silent -X GET "repos/ampproject/amp-wp/branches/${{ env.BRANCH_NAME }}" 2> /dev/null && echo 1 || echo 0)
+
+      # Cancel workflow run if there is already an open PR.
+      - name: Cancel workflow run if a PR is already open
+        if: steps.detect_pr.outputs.exists == 0
+        run: gh api -X POST "repos/ampproject/amp-wp/actions/runs/${{ github.run_id }}/cancel"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Configure Composer cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --optimize-autoloader --no-progress --no-interaction
+
+      - name: Generate plugin documentation
+        run: ./vendor/bin/wp amp docs generate
+
+      - name: Detect changes
+        id: detect_changes
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
+
+      # Cancel workflow run if there are no updates to docs.
+      - name: Cancel workflow run if no updates to documentation
+        if: steps.detect_changes.outputs.changed == 0
+        run: gh api -X POST "repos/ampproject/amp-wp/actions/runs/${{ github.run_id }}/cancel"
+
+      - name: Commit changes
+        run: |
+          git checkout ${{ env.BRANCH_NAME }}
+          git add --all .
+          git commit -m "Update documentation - $(date +'%Y-%m-%d')"
+
+      - name: Create pull request
+        run: gh pr create --title "Update documentation" --body "" --label Documentation

From 3fb8d390ee06e580ef9695a95e5c134f0ba31e36 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sat, 8 May 2021 07:20:45 -0400
Subject: [PATCH 02/30] Create branch when checking out

---
 .github/workflows/generate-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 26529f73037..cb7cb91b581 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -55,7 +55,7 @@ jobs:
 
       - name: Commit changes
         run: |
-          git checkout ${{ env.BRANCH_NAME }}
+          git checkout -b ${{ env.BRANCH_NAME }}
           git add --all .
           git commit -m "Update documentation - $(date +'%Y-%m-%d')"
 

From 9e3a404260288b5d0e59a7b8db91133f6eab1204 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sat, 8 May 2021 17:34:50 -0400
Subject: [PATCH 03/30] Pass `GITHUB_TOKEN` to step that use GH CLI

---
 .github/workflows/generate-docs.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index cb7cb91b581..2e9e6ae234c 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -17,8 +17,10 @@ jobs:
 
       # Cancel workflow run if there is already an open PR.
       - name: Cancel workflow run if a PR is already open
-        if: steps.detect_pr.outputs.exists == 0
+        if: steps.detect_pr.outputs.exists == 1
         run: gh api -X POST "repos/ampproject/amp-wp/actions/runs/${{ github.run_id }}/cancel"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout
         uses: actions/checkout@v2
@@ -46,12 +48,14 @@ jobs:
 
       - name: Detect changes
         id: detect_changes
-        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 1 || echo 0)
 
       # Cancel workflow run if there are no updates to docs.
       - name: Cancel workflow run if no updates to documentation
-        if: steps.detect_changes.outputs.changed == 0
+        if: steps.detect_changes.outputs.changed == 1
         run: gh api -X POST "repos/ampproject/amp-wp/actions/runs/${{ github.run_id }}/cancel"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Commit changes
         run: |
@@ -61,3 +65,5 @@ jobs:
 
       - name: Create pull request
         run: gh pr create --title "Update documentation" --body "" --label Documentation
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 236da024fe4416df432e148268e5fb7d5842cc67 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 05:01:04 -0400
Subject: [PATCH 04/30] Add step to setup WordPress

---
 .github/workflows/generate-docs.yml | 38 ++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 2e9e6ae234c..de36f786949 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -5,23 +5,23 @@ on:
 
 env:
   BRANCH_NAME: update/docs
+  REPO_NAME: ampproject/amp-wp
 
 jobs:
-  generate_docs:
-    name: 'Generate documentation'
+  precheck:
+    name: 'Run pre-checks'
     runs-on: ubuntu-latest
     steps:
       - name: Detect if PR already exists
         id: detect_pr
-        run: echo ::set-output name=exists::$(gh api --silent -X GET "repos/ampproject/amp-wp/branches/${{ env.BRANCH_NAME }}" 2> /dev/null && echo 1 || echo 0)
-
-      # Cancel workflow run if there is already an open PR.
-      - name: Cancel workflow run if a PR is already open
-        if: steps.detect_pr.outputs.exists == 1
-        run: gh api -X POST "repos/ampproject/amp-wp/actions/runs/${{ github.run_id }}/cancel"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # Fail if the branch exists, otherwise carry on.
+        run: gh api --silent -X GET "repos/${{ env.REPO_NAME }}/branches/${{ env.BRANCH_NAME }}" 2> /dev/null && exit 1 || true
 
+  generate_docs:
+    name: 'Generate documentation'
+    runs-on: ubuntu-latest
+    needs: precheck
+    steps:
       - name: Checkout
         uses: actions/checkout@v2
 
@@ -43,8 +43,22 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --prefer-dist --optimize-autoloader --no-progress --no-interaction
 
+      - name: Setup WordPress
+        run: |
+          docker-compose up -d
+          MYSQL_PASSWORD=$(docker-compose exec mysql printenv MYSQL_ROOT_PASSWORD)
+          WORDPRESS_DB_NAME=$(docker-compose exec wordpress printenv WORDPRESS_DB_NAME)
+          HOST_PORT=$(docker-compose port wordpress 80 | awk -F : '{printf $2}')
+
+          docker-compose exec -e MYSQL_PWD="$MYSQL_PASSWORD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
+          docker-compose exec cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
+
+          docker-compose exec cli wp plugin activate amp
+        working-directory: bin/local-env
+
       - name: Generate plugin documentation
-        run: ./vendor/bin/wp amp docs generate
+        run: docker-compose exec cli wp amp docs generate
+        working-directory: bin/local-env
 
       - name: Detect changes
         id: detect_changes
@@ -53,7 +67,7 @@ jobs:
       # Cancel workflow run if there are no updates to docs.
       - name: Cancel workflow run if no updates to documentation
         if: steps.detect_changes.outputs.changed == 1
-        run: gh api -X POST "repos/ampproject/amp-wp/actions/runs/${{ github.run_id }}/cancel"
+        run: gh api -X POST "repos/${{ env.REPO_NAME }}/actions/runs/${{ github.run_id }}/cancel"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

From af434bbf793b92723b874679e59a9ebf0c25bbd6 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 16:04:15 -0400
Subject: [PATCH 05/30] Note what's going on

---
 .github/workflows/generate-docs.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index de36f786949..0e40e053715 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   precheck:
-    name: 'Run pre-checks'
+    name: Pre-checks
     runs-on: ubuntu-latest
     steps:
       - name: Detect if PR already exists
@@ -46,13 +46,19 @@ jobs:
       - name: Setup WordPress
         run: |
           docker-compose up -d
-          MYSQL_PASSWORD=$(docker-compose exec mysql printenv MYSQL_ROOT_PASSWORD)
+
+          echo "Getting env vars"
+          MYSQL_PWD=$(docker-compose exec mysql printenv MYSQL_ROOT_PASSWORD)
           WORDPRESS_DB_NAME=$(docker-compose exec wordpress printenv WORDPRESS_DB_NAME)
           HOST_PORT=$(docker-compose port wordpress 80 | awk -F : '{printf $2}')
 
-          docker-compose exec -e MYSQL_PWD="$MYSQL_PASSWORD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
+          echo "Creating db"
+          docker-compose exec -e MYSQL_PWD="MYSQL_PWD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
+          echo "Installing WP"
           docker-compose exec cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
 
+          echo "Activating AMP plugin"
+          touch assets/js/amp-block-editor.js
           docker-compose exec cli wp plugin activate amp
         working-directory: bin/local-env
 
@@ -62,7 +68,7 @@ jobs:
 
       - name: Detect changes
         id: detect_changes
-        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 1 || echo 0)
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 0 || echo 1)
 
       # Cancel workflow run if there are no updates to docs.
       - name: Cancel workflow run if no updates to documentation

From 407964e5f6a907125827d6bff745be79478d7ee5 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 16:27:48 -0400
Subject: [PATCH 06/30] Disable TTY allocation

---
 .github/workflows/generate-docs.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 0e40e053715..40261cddd01 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -48,22 +48,23 @@ jobs:
           docker-compose up -d
 
           echo "Getting env vars"
-          MYSQL_PWD=$(docker-compose exec mysql printenv MYSQL_ROOT_PASSWORD)
-          WORDPRESS_DB_NAME=$(docker-compose exec wordpress printenv WORDPRESS_DB_NAME)
+          MYSQL_PWD=$(docker-compose exec -T mysql printenv MYSQL_ROOT_PASSWORD)
+          WORDPRESS_DB_NAME=$(docker-compose exec -T wordpress printenv WORDPRESS_DB_NAME)
           HOST_PORT=$(docker-compose port wordpress 80 | awk -F : '{printf $2}')
 
           echo "Creating db"
-          docker-compose exec -e MYSQL_PWD="MYSQL_PWD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
+          docker-compose exec -T -e MYSQL_PWD="$MYSQL_PWD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
+
           echo "Installing WP"
-          docker-compose exec cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
+          docker-compose exec -T cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
 
           echo "Activating AMP plugin"
           touch assets/js/amp-block-editor.js
-          docker-compose exec cli wp plugin activate amp
+          docker-compose exec -T cli wp plugin activate amp
         working-directory: bin/local-env
 
       - name: Generate plugin documentation
-        run: docker-compose exec cli wp amp docs generate
+        run: docker-compose exec -T cli wp amp docs generate
         working-directory: bin/local-env
 
       - name: Detect changes

From 5c9f7cda3968ceb4ee3b8f9e629f17bf4679640e Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 16:55:03 -0400
Subject: [PATCH 07/30] [skip ci] Wait until DB is ready

---
 .github/workflows/generate-docs.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 40261cddd01..771c0c6f8d6 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -52,6 +52,13 @@ jobs:
           WORDPRESS_DB_NAME=$(docker-compose exec -T wordpress printenv WORDPRESS_DB_NAME)
           HOST_PORT=$(docker-compose port wordpress 80 | awk -F : '{printf $2}')
 
+          # Wait until the database container is ready.
+          echo -en "Waiting for database connection..."
+          until $(docker-compose exec -T wordpress bash -c "echo -n > /dev/tcp/mysql/3306" >/dev/null 2>&1); do
+              echo -n '.'
+              sleep 5
+          done
+
           echo "Creating db"
           docker-compose exec -T -e MYSQL_PWD="$MYSQL_PWD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
 

From a2b88bf6fe8815406770ed8b1e1be33d15f9db66 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 17:03:41 -0400
Subject: [PATCH 08/30] [skip ci] Quote env var

---
 .github/workflows/generate-docs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 771c0c6f8d6..f88da282be9 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -58,9 +58,10 @@ jobs:
               echo -n '.'
               sleep 5
           done
+          echo ''
 
           echo "Creating db"
-          docker-compose exec -T -e MYSQL_PWD="$MYSQL_PWD" mysql mysql -e 'CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME'
+          docker-compose exec -T -e MYSQL_PWD="$MYSQL_PWD" mysql mysql -e "CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME"
 
           echo "Installing WP"
           docker-compose exec -T cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT

From 606e2367d2a1694a04060b54b4aebcaa5b5fd593 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 17:07:52 -0400
Subject: [PATCH 09/30] [skip ci] Create file in correct dir

---
 .github/workflows/generate-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index f88da282be9..406a7c551f4 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -67,7 +67,7 @@ jobs:
           docker-compose exec -T cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
 
           echo "Activating AMP plugin"
-          touch assets/js/amp-block-editor.js
+          touch ../../assets/js/amp-block-editor.js
           docker-compose exec -T cli wp plugin activate amp
         working-directory: bin/local-env
 

From 9672a9eb39526b2fd0031f32e1e18771a198b61d Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 17:55:28 -0400
Subject: [PATCH 10/30] [skip ci] Set user to generate docs without permission
 errors

---
 .github/workflows/generate-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 406a7c551f4..9cbed1c290d 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -72,7 +72,7 @@ jobs:
         working-directory: bin/local-env
 
       - name: Generate plugin documentation
-        run: docker-compose exec -T cli wp amp docs generate
+        run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
         working-directory: bin/local-env
 
       - name: Detect changes

From ca050f9b50480944e1d39d983bfd05268affd0e9 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 18:09:24 -0400
Subject: [PATCH 11/30] [skip ci] Fix logic

---
 .github/workflows/generate-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 9cbed1c290d..1cb1d3063e8 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -77,7 +77,7 @@ jobs:
 
       - name: Detect changes
         id: detect_changes
-        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 0 || echo 1)
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 1 || echo 0)
 
       # Cancel workflow run if there are no updates to docs.
       - name: Cancel workflow run if no updates to documentation

From 1790607ba61b02e96d2e7bbde1bc678808d29ab4 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 18:17:27 -0400
Subject: [PATCH 12/30] [skip ci] Configure git user

---
 .github/workflows/generate-docs.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 1cb1d3063e8..57275c8a8ab 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -86,6 +86,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Configure git user
+        run: |
+          git config --global user.email "pierregordon@protonmail.com"
+          git config --global user.name "Pierre Gordon"
+
       - name: Commit changes
         run: |
           git checkout -b ${{ env.BRANCH_NAME }}

From 77d6c77736ef3e3da075fa6e768964475251b5ed Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 18:24:35 -0400
Subject: [PATCH 13/30] [skip ci] Push branch

---
 .github/workflows/generate-docs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 57275c8a8ab..38c8b5be926 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -98,6 +98,8 @@ jobs:
           git commit -m "Update documentation - $(date +'%Y-%m-%d')"
 
       - name: Create pull request
-        run: gh pr create --title "Update documentation" --body "" --label Documentation
+        run: |
+          git push -u origin ${{ env.BRANCH_NAME }}
+          gh pr create --title "Update documentation" --body "" --label Documentation
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 2361d5f0639a79f62c6bee86ce17e48da16bb870 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 19:56:18 -0400
Subject: [PATCH 14/30] [skip ci] Check if remote branch already exists

---
 .github/workflows/generate-docs.yml | 34 +++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 38c8b5be926..bde5e516208 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -5,22 +5,12 @@ on:
 
 env:
   BRANCH_NAME: update/docs
-  REPO_NAME: ampproject/amp-wp
+  PR_NAME: Update documentation
 
 jobs:
-  precheck:
-    name: Pre-checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Detect if PR already exists
-        id: detect_pr
-        # Fail if the branch exists, otherwise carry on.
-        run: gh api --silent -X GET "repos/${{ env.REPO_NAME }}/branches/${{ env.BRANCH_NAME }}" 2> /dev/null && exit 1 || true
-
   generate_docs:
     name: 'Generate documentation'
     runs-on: ubuntu-latest
-    needs: precheck
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -77,12 +67,12 @@ jobs:
 
       - name: Detect changes
         id: detect_changes
-        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 1 || echo 0)
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 0 || echo 1)
 
       # Cancel workflow run if there are no updates to docs.
       - name: Cancel workflow run if no updates to documentation
         if: steps.detect_changes.outputs.changed == 1
-        run: gh api -X POST "repos/${{ env.REPO_NAME }}/actions/runs/${{ github.run_id }}/cancel"
+        run: gh api -X POST "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/cancel"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -91,11 +81,27 @@ jobs:
           git config --global user.email "pierregordon@protonmail.com"
           git config --global user.name "Pierre Gordon"
 
-      - name: Commit changes
+      - name: Check if remote branch exists
+        id: remote-branch
+        run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) ]] && echo "0" || echo "1")
+
+      - name: Create branch to base pull request on
+        if: steps.remote-branch.outputs.exists == 0
         run: |
           git checkout -b ${{ env.BRANCH_NAME }}
+
+      - name: Fetch existing branch to add commits to
+        if: steps.remote-branch.outputs.exists == 1
+        run: |
+          git fetch --all --prune
+          git checkout ${{ env.BRANCH_NAME }}
+          git pull --no-rebase
+
+      - name: Commit and push changes
+        run: |
           git add --all .
           git commit -m "Update documentation - $(date +'%Y-%m-%d')"
+          git push origin ${{ env.BRANCH_NAME }}
 
       - name: Create pull request
         run: |

From 66c4e9830b05b3e9d1b712ad3a9b85d4507d4f61 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 20:31:34 -0400
Subject: [PATCH 15/30] [skip ci] Fail if no changes

---
 .github/workflows/generate-docs.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index bde5e516208..cde2f349819 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -65,16 +65,8 @@ jobs:
         run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
         working-directory: bin/local-env
 
-      - name: Detect changes
-        id: detect_changes
-        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo 0 || echo 1)
-
-      # Cancel workflow run if there are no updates to docs.
-      - name: Cancel workflow run if no updates to documentation
-        if: steps.detect_changes.outputs.changed == 1
-        run: gh api -X POST "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/cancel"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Stop workflow run if there are no changes
+        run: "[[ -z $(git status --porcelain) ]] || exit 1"
 
       - name: Configure git user
         run: |

From ae71054b718b4419cfcf4491b86da1bd8ed9f90e Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 22:45:06 -0400
Subject: [PATCH 16/30] [skip ci] Set PHP version

---
 .github/workflows/generate-docs.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index cde2f349819..a868bbc329b 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -17,6 +17,8 @@ jobs:
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
 
       - name: Get Composer Cache Directory
         id: composer-cache

From 1c1eb5dbeacbb7deacada067da71cd8baabf1486 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 22:50:11 -0400
Subject: [PATCH 17/30] [skip ci] Fix logic

---
 .github/workflows/generate-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index a868bbc329b..b57253c6b57 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -68,7 +68,7 @@ jobs:
         working-directory: bin/local-env
 
       - name: Stop workflow run if there are no changes
-        run: "[[ -z $(git status --porcelain) ]] || exit 1"
+        run: "[[ -z $(git status --porcelain) ]] && exit 1"
 
       - name: Configure git user
         run: |

From 5ccc6cec3d7c4009b756f04be7d12750960a12e6 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 23:08:50 -0400
Subject: [PATCH 18/30] [skip ci] Make workflow successful even if no changes

---
 .github/workflows/generate-docs.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index b57253c6b57..828e49903ae 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -67,39 +67,44 @@ jobs:
         run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
         working-directory: bin/local-env
 
-      - name: Stop workflow run if there are no changes
-        run: "[[ -z $(git status --porcelain) ]] && exit 1"
+      - name: Check if there are changes
+        id: changes
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
 
       - name: Configure git user
+        if: steps.changes.outputs.changed == 1
         run: |
           git config --global user.email "pierregordon@protonmail.com"
           git config --global user.name "Pierre Gordon"
 
       - name: Check if remote branch exists
         id: remote-branch
+        if: steps.changes.outputs.changed == 1
         run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) ]] && echo "0" || echo "1")
 
       - name: Create branch to base pull request on
-        if: steps.remote-branch.outputs.exists == 0
+        if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 0
         run: |
           git checkout -b ${{ env.BRANCH_NAME }}
 
       - name: Fetch existing branch to add commits to
-        if: steps.remote-branch.outputs.exists == 1
+        if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 1
         run: |
           git fetch --all --prune
           git checkout ${{ env.BRANCH_NAME }}
           git pull --no-rebase
 
       - name: Commit and push changes
+        if: steps.changes.outputs.changed == 1
         run: |
           git add --all .
           git commit -m "Update documentation - $(date +'%Y-%m-%d')"
           git push origin ${{ env.BRANCH_NAME }}
 
       - name: Create pull request
+        if: steps.changes.outputs.changed == 1
         run: |
           git push -u origin ${{ env.BRANCH_NAME }}
-          gh pr create --title "Update documentation" --body "" --label Documentation
+          gh pr create --base ${GITHUB_REF#refs/heads/} --title "Update documentation" --body "" --label Documentation
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 4aa039665b3e046b81e5affb5b2f5b8c2c4fa7ab Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 9 May 2021 23:14:23 -0400
Subject: [PATCH 19/30] [skip ci] Checkout before making changes

---
 .github/workflows/generate-docs.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 828e49903ae..f795ee22ded 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -63,37 +63,35 @@ jobs:
           docker-compose exec -T cli wp plugin activate amp
         working-directory: bin/local-env
 
-      - name: Generate plugin documentation
-        run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
-        working-directory: bin/local-env
-
-      - name: Check if there are changes
-        id: changes
-        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
-
       - name: Configure git user
-        if: steps.changes.outputs.changed == 1
         run: |
           git config --global user.email "pierregordon@protonmail.com"
           git config --global user.name "Pierre Gordon"
 
       - name: Check if remote branch exists
         id: remote-branch
-        if: steps.changes.outputs.changed == 1
         run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) ]] && echo "0" || echo "1")
 
       - name: Create branch to base pull request on
-        if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 0
+        if: steps.remote-branch.outputs.exists == 0
         run: |
           git checkout -b ${{ env.BRANCH_NAME }}
 
       - name: Fetch existing branch to add commits to
-        if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 1
+        if: steps.remote-branch.outputs.exists == 1
         run: |
           git fetch --all --prune
           git checkout ${{ env.BRANCH_NAME }}
           git pull --no-rebase
 
+      - name: Generate plugin documentation
+        run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
+        working-directory: bin/local-env
+
+      - name: Check if there are changes
+        id: changes
+        run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
+
       - name: Commit and push changes
         if: steps.changes.outputs.changed == 1
         run: |

From d1a17e83ab8ea1f57b61faeeac08018426d9896e Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 00:20:00 -0400
Subject: [PATCH 20/30] [skip ci] Merge changes from base branch

---
 .github/workflows/generate-docs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index f795ee22ded..dda0afcfc9f 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -83,6 +83,7 @@ jobs:
           git fetch --all --prune
           git checkout ${{ env.BRANCH_NAME }}
           git pull --no-rebase
+          git merge --no-edit ${GITHUB_REF#refs/heads/}
 
       - name: Generate plugin documentation
         run: docker-compose exec -T -u $(id --user) cli wp amp docs generate

From 3d62de60d431c0fc694b030bbf21d1188c8ba8ee Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 00:25:47 -0400
Subject: [PATCH 21/30] [skip ci] Only create PR if branch doesn't exist

---
 .github/workflows/generate-docs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index dda0afcfc9f..016dbdbd38c 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -101,9 +101,9 @@ jobs:
           git push origin ${{ env.BRANCH_NAME }}
 
       - name: Create pull request
-        if: steps.changes.outputs.changed == 1
+        if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 0
         run: |
           git push -u origin ${{ env.BRANCH_NAME }}
-          gh pr create --base ${GITHUB_REF#refs/heads/} --title "Update documentation" --body "" --label Documentation
+          gh pr create --base ${GITHUB_REF#refs/heads/} --title "Update documentation for `${GITHUB_REF#refs/heads/}` branch" --body "" --label Documentation
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 181735de9fe25363bea4b34771b198985a1c8683 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 00:48:20 -0400
Subject: [PATCH 22/30] [skip ci] Merge from origin

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

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 016dbdbd38c..26c98270429 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -5,7 +5,6 @@ on:
 
 env:
   BRANCH_NAME: update/docs
-  PR_NAME: Update documentation
 
 jobs:
   generate_docs:
@@ -83,7 +82,7 @@ jobs:
           git fetch --all --prune
           git checkout ${{ env.BRANCH_NAME }}
           git pull --no-rebase
-          git merge --no-edit ${GITHUB_REF#refs/heads/}
+          git merge --no-edit origin/${GITHUB_REF#refs/heads/}
 
       - name: Generate plugin documentation
         run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
@@ -97,7 +96,7 @@ jobs:
         if: steps.changes.outputs.changed == 1
         run: |
           git add --all .
-          git commit -m "Update documentation - $(date +'%Y-%m-%d')"
+          git commit -m "Update documentation"
           git push origin ${{ env.BRANCH_NAME }}
 
       - name: Create pull request

From 575518444cafdffae0a8a6ff34d3e1cb7e32935f Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 01:28:22 -0400
Subject: [PATCH 23/30] [skip ci] Fetch all commits

---
 .github/workflows/generate-docs.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 26c98270429..232f8f8def5 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -62,11 +64,6 @@ jobs:
           docker-compose exec -T cli wp plugin activate amp
         working-directory: bin/local-env
 
-      - name: Configure git user
-        run: |
-          git config --global user.email "pierregordon@protonmail.com"
-          git config --global user.name "Pierre Gordon"
-
       - name: Check if remote branch exists
         id: remote-branch
         run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) ]] && echo "0" || echo "1")
@@ -79,10 +76,8 @@ jobs:
       - name: Fetch existing branch to add commits to
         if: steps.remote-branch.outputs.exists == 1
         run: |
-          git fetch --all --prune
           git checkout ${{ env.BRANCH_NAME }}
-          git pull --no-rebase
-          git merge --no-edit origin/${GITHUB_REF#refs/heads/}
+          git merge --no-edit ${GITHUB_REF#refs/heads/}
 
       - name: Generate plugin documentation
         run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
@@ -92,6 +87,12 @@ jobs:
         id: changes
         run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
 
+      - name: Configure git user
+        if: steps.changes.outputs.changed == 1
+        run: |
+          git config user.email "pierregordon@protonmail.com"
+          git config user.name "Pierre Gordon"
+
       - name: Commit and push changes
         if: steps.changes.outputs.changed == 1
         run: |

From b949a4ba771e755e3084ac52d76079f431cf3981 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 01:33:07 -0400
Subject: [PATCH 24/30] [skip ci] Configure git user before committing

---
 .github/workflows/generate-docs.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 232f8f8def5..9b06046e960 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -64,6 +64,11 @@ jobs:
           docker-compose exec -T cli wp plugin activate amp
         working-directory: bin/local-env
 
+      - name: Configure git user
+        run: |
+          git config user.email "pierregordon@protonmail.com"
+          git config user.name "Pierre Gordon"
+
       - name: Check if remote branch exists
         id: remote-branch
         run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) ]] && echo "0" || echo "1")
@@ -87,12 +92,6 @@ jobs:
         id: changes
         run: echo ::set-output name=changed::$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")
 
-      - name: Configure git user
-        if: steps.changes.outputs.changed == 1
-        run: |
-          git config user.email "pierregordon@protonmail.com"
-          git config user.name "Pierre Gordon"
-
       - name: Commit and push changes
         if: steps.changes.outputs.changed == 1
         run: |

From 3bad88aed3c3993d1a412ef3a63e43eeb564f9e0 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 01:43:53 -0400
Subject: [PATCH 25/30] [skip ci] Remove `root` key from each file object

---
 docs/src/Parser/Parser.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/src/Parser/Parser.php b/docs/src/Parser/Parser.php
index 2d5b7ae7b50..e252de21eb9 100644
--- a/docs/src/Parser/Parser.php
+++ b/docs/src/Parser/Parser.php
@@ -87,7 +87,6 @@ public function parse_files( $files, $root ) {
 			$out = [
 				'file' => $this->export_docblock( $file ),
 				'path' => str_replace( DIRECTORY_SEPARATOR, '/', $file->getFilename() ),
-				'root' => $root,
 			];
 
 			if ( ! empty( $file->uses ) ) {

From 515e32af235183df7caf9817b57680f079178a30 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 02:52:05 -0400
Subject: [PATCH 26/30] [skip ci] Determine branch names

---
 .github/workflows/generate-docs.yml | 35 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 9b06046e960..464212ec0ef 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -3,9 +3,6 @@ name: Plugin Documentation
 on:
   workflow_dispatch:
 
-env:
-  BRANCH_NAME: update/docs
-
 jobs:
   generate_docs:
     name: 'Generate documentation'
@@ -16,6 +13,12 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Determine branch names
+        id: branches
+        run: |
+          run: echo "::set-output name=base::$(echo ${GITHUB_REF#refs/heads/})"
+          run: echo "::set-output name=head::$(echo "update/docs-$BASE_BRANCH")"
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -71,18 +74,24 @@ jobs:
 
       - name: Check if remote branch exists
         id: remote-branch
-        run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin ${{ env.BRANCH_NAME }}) ]] && echo "0" || echo "1")
+        run: echo ::set-output name=exists::$([[ -z $(git ls-remote --heads origin "$HEAD_BRANCH" ) ]] && echo "0" || echo "1")
+        env:
+          HEAD_BRANCH: ${{ steps.branches.outputs.head }}
 
       - name: Create branch to base pull request on
         if: steps.remote-branch.outputs.exists == 0
-        run: |
-          git checkout -b ${{ env.BRANCH_NAME }}
+        run: git checkout -b "$HEAD_BRANCH"
+        env:
+          HEAD_BRANCH: ${{ steps.branches.outputs.head }}
 
       - name: Fetch existing branch to add commits to
         if: steps.remote-branch.outputs.exists == 1
         run: |
-          git checkout ${{ env.BRANCH_NAME }}
-          git merge --no-edit ${GITHUB_REF#refs/heads/}
+          git checkout "$HEAD_BRANCH"
+          git merge --no-edit "$BASE_BRANCH"
+        env:
+          BASE_BRANCH: ${{ steps.branches.outputs.base }}
+          HEAD_BRANCH: ${{ steps.branches.outputs.head }}
 
       - name: Generate plugin documentation
         run: docker-compose exec -T -u $(id --user) cli wp amp docs generate
@@ -97,12 +106,16 @@ jobs:
         run: |
           git add --all .
           git commit -m "Update documentation"
-          git push origin ${{ env.BRANCH_NAME }}
+          git push origin "$HEAD_BRANCH"
+        env:
+          HEAD_BRANCH: ${{ steps.branches.outputs.head }}
 
       - name: Create pull request
         if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 0
         run: |
-          git push -u origin ${{ env.BRANCH_NAME }}
-          gh pr create --base ${GITHUB_REF#refs/heads/} --title "Update documentation for `${GITHUB_REF#refs/heads/}` branch" --body "" --label Documentation
+          git push -u origin "$HEAD_BRANCH"
+          gh pr create --base "$BASE_BRANCH" --title "Update documentation for `$BASE_BRANCH` branch" --body "" --label Documentation
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BASE_BRANCH: ${{ steps.branches.outputs.base }}
+          HEAD_BRANCH: ${{ steps.branches.outputs.head }}

From cf09327e34cf4e1a60b52584751d502d1b6ac3dc Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 03:03:06 -0400
Subject: [PATCH 27/30] [skip ci] Fix syntax error

---
 .github/workflows/generate-docs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 464212ec0ef..df3253b3bf3 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -16,8 +16,8 @@ jobs:
       - name: Determine branch names
         id: branches
         run: |
-          run: echo "::set-output name=base::$(echo ${GITHUB_REF#refs/heads/})"
-          run: echo "::set-output name=head::$(echo "update/docs-$BASE_BRANCH")"
+          echo "::set-output name=base::$(echo ${GITHUB_REF#refs/heads/})"
+          echo "::set-output name=head::$(echo "update/docs-$BASE_BRANCH")"
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From 14aa5160e6321be7b5ad27455f5694ba78f0e247 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 03:12:00 -0400
Subject: [PATCH 28/30] [skip ci] Fix env var

---
 .github/workflows/generate-docs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index df3253b3bf3..1a6df8950b6 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -16,7 +16,8 @@ jobs:
       - name: Determine branch names
         id: branches
         run: |
-          echo "::set-output name=base::$(echo ${GITHUB_REF#refs/heads/})"
+          BASE_BRANCH=${GITHUB_REF#refs/heads/}
+          echo "::set-output name=base::$(echo "$BASE_BRANCH")"
           echo "::set-output name=head::$(echo "update/docs-$BASE_BRANCH")"
 
       - name: Setup PHP

From cc1f3cb79c1ab5c71182cc1c598576f189e838a5 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 03:15:17 -0400
Subject: [PATCH 29/30] [skip ci] Escape branch name

---
 .github/workflows/generate-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 1a6df8950b6..abb60a9a29c 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -115,7 +115,7 @@ jobs:
         if: steps.changes.outputs.changed == 1 && steps.remote-branch.outputs.exists == 0
         run: |
           git push -u origin "$HEAD_BRANCH"
-          gh pr create --base "$BASE_BRANCH" --title "Update documentation for `$BASE_BRANCH` branch" --body "" --label Documentation
+          gh pr create --base "$BASE_BRANCH" --title "Update documentation for \`$BASE_BRANCH\` branch" --body "" --label Documentation
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BASE_BRANCH: ${{ steps.branches.outputs.base }}

From 4cd77d61214e65d228bfce6b5434369425b25c49 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 10 May 2021 03:47:39 -0400
Subject: [PATCH 30/30] [skip ci] Group some log lines

---
 .github/workflows/generate-docs.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index abb60a9a29c..2233b0a8eb1 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -11,6 +11,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
+          # Fetch history for all branches and tags to allow for successful merge of base branch if needed.
           fetch-depth: 0
 
       - name: Determine branch names
@@ -44,28 +45,33 @@ jobs:
         run: |
           docker-compose up -d
 
-          echo "Getting env vars"
+          echo "::group::Get environment vars from containers"
           MYSQL_PWD=$(docker-compose exec -T mysql printenv MYSQL_ROOT_PASSWORD)
           WORDPRESS_DB_NAME=$(docker-compose exec -T wordpress printenv WORDPRESS_DB_NAME)
           HOST_PORT=$(docker-compose port wordpress 80 | awk -F : '{printf $2}')
+          echo "::endgroup::"
 
-          # Wait until the database container is ready.
+          echo "::group::Wait for database container to be ready"
           echo -en "Waiting for database connection..."
           until $(docker-compose exec -T wordpress bash -c "echo -n > /dev/tcp/mysql/3306" >/dev/null 2>&1); do
               echo -n '.'
               sleep 5
           done
           echo ''
+          echo "::endgroup::"
 
-          echo "Creating db"
+          echo "::group::Installing WordPress"
           docker-compose exec -T -e MYSQL_PWD="$MYSQL_PWD" mysql mysql -e "CREATE DATABASE IF NOT EXISTS $WORDPRESS_DB_NAME"
+          docker-compose exec -T cli wp core install \
+            --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
+          echo "::endgroup::"
 
-          echo "Installing WP"
-          docker-compose exec -T cli wp core install --title="Docs" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$HOST_PORT
-
-          echo "Activating AMP plugin"
+          echo "::group::Activate AMP plugin"
+          # Building the JS assets is required for the plugin to activate successfully, but since we're only generating
+          # the docs we simply create the file being checked for to save some time.
           touch ../../assets/js/amp-block-editor.js
           docker-compose exec -T cli wp plugin activate amp
+          echo "::endgroup::"
         working-directory: bin/local-env
 
       - name: Configure git user