From: Gereon Kremer <nafur42@gmail.com>
Date: Wed, 9 Jun 2021 19:25:04 +0000 (+0200)
Subject: Make squasing more robust (#6713)
X-Git-Tag: cvc5-1.0.0~1616
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=181a175839e3af50a8cf7f80adf635fe612aeaba;p=cvc5.git

Make squasing more robust (#6713)

This PR makes squashing olds commits in the docs-cleanup CI job more robust: it makes sure that the squash commit has a proper commit date and that we gracefully handle if there is nothing to squash.
---

diff --git a/.github/workflows/docs_cleanup.yml b/.github/workflows/docs_cleanup.yml
index 761736e75..6632cbf45 100644
--- a/.github/workflows/docs_cleanup.yml
+++ b/.github/workflows/docs_cleanup.yml
@@ -44,15 +44,19 @@ jobs:
             SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           cd target
-          git log
           first=`git rev-list --max-parents=0 HEAD`
           last=`git rev-list --until=1.month.ago -n1 HEAD`
           if [ -n "$last" ]; then
             git checkout $last
+            ts=`git log -1 --format=%ct`
             git reset --soft $first
-            git commit -m "Squash old history"
+            if git diff --cached --exit-code
+            then
+              echo "Nothing to squash"
+            else
+              git commit -m "Squash old history" --date=$ts
+            fi
             git cherry-pick $last..main
-            git log
           fi
       
       - name: Push