From ef896faa0153d0d96b6d6eafe7dd53b178525a25 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Thu, 16 Jul 2020 13:44:58 +0200
Subject: [PATCH 1/2] Fix deploy script for beta deployment

Since the beta/ directory already exists, we can't copy the complete master dir
---
 .github/deploy.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/deploy.sh b/.github/deploy.sh
index 3f425e5b7258..e0a95fb9f363 100644
--- a/.github/deploy.sh
+++ b/.github/deploy.sh
@@ -19,7 +19,7 @@ fi
 
 if [[ $BETA = "true" ]]; then
   echo "Update documentation for the beta release"
-  cp -r out/master out/beta
+  cp -r out/master/* out/beta
 fi
 
 # Generate version index that is shown as root index page
@@ -33,12 +33,11 @@ cd out
 git config user.name "GHA CI"
 git config user.email "gha@ci.invalid"
 
-if git diff --exit-code --quiet; then
-  echo "No changes to the output on this push; exiting."
-  exit 0
-fi
-
 if [[ -n $TAG_NAME ]]; then
+  if git diff --exit-code --quiet -- $TAG_NAME/; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+  fi
   # Add the new dir
   git add "$TAG_NAME"
   # Update the symlink
@@ -47,9 +46,17 @@ if [[ -n $TAG_NAME ]]; then
   git add versions.json
   git commit -m "Add documentation for ${TAG_NAME} release: ${SHA}"
 elif [[ $BETA = "true" ]]; then
+  if git diff --exit-code --quiet -- beta/; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+  fi
   git add beta
   git commit -m "Automatic deploy to GitHub Pages (beta): ${SHA}"
 else
+  if git diff --exit-code --quiet; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+  fi
   git add .
   git commit -m "Automatic deploy to GitHub Pages: ${SHA}"
 fi

From c65eb4d66314d22d85cf2e58ff20ec1ca7404751 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Thu, 16 Jul 2020 14:42:13 +0200
Subject: [PATCH 2/2] Track tag files, before checking for the diff

---
 .github/deploy.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/deploy.sh b/.github/deploy.sh
index e0a95fb9f363..e85e8874ba60 100644
--- a/.github/deploy.sh
+++ b/.github/deploy.sh
@@ -34,6 +34,8 @@ git config user.name "GHA CI"
 git config user.email "gha@ci.invalid"
 
 if [[ -n $TAG_NAME ]]; then
+  # track files, so that the following check works
+  git add --intent-to-add "$TAG_NAME"
   if git diff --exit-code --quiet -- $TAG_NAME/; then
     echo "No changes to the output on this push; exiting."
     exit 0