From 89f0b75334f8628d56230b0cbc7b18ee271be97e Mon Sep 17 00:00:00 2001
From: Aadyot Bhatnagar <abhatnagar@salesforce.com>
Date: Thu, 23 Sep 2021 13:48:13 -0700
Subject: [PATCH] Prevent build from failing due to empty git stash.

Also try to build docs from PR's in the future.
---
 .github/workflows/docs.yml | 2 ++
 docs/build_docs.sh         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 11d05370f..9b1c59a5d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -3,6 +3,8 @@ name: docs
 on:
   push:
     branches: [ main ]
+  pull_request:
+    branches: [ main ]
   release:
     types: [ published ]
 
diff --git a/docs/build_docs.sh b/docs/build_docs.sh
index f1a17d205..e273a4e1c 100755
--- a/docs/build_docs.sh
+++ b/docs/build_docs.sh
@@ -90,4 +90,4 @@ EOF
 
 # Return to original git state
 git switch "$GIT_BRANCH"
-git stash pop
+git stash pop || true