From: Gereon Kremer <gkremer@stanford.edu>
Date: Thu, 27 Jan 2022 00:34:16 +0000 (-0800)
Subject: Properly recognize whether the current commit is a tag (#7989)
X-Git-Tag: cvc5-1.0.0~500
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47d619f8600c8c409ce8849dcbddc72fa314371b;p=cvc5.git

Properly recognize whether the current commit is a tag (#7989)

This actually fixes what #7901 tried: when uploading the documentation, we need to figure out whether it was a tag and we should upload as a release as well.
Furthermore it fixes how we setup the deploy keys.
---

diff --git a/.github/workflows/docs_upload.yml b/.github/workflows/docs_upload.yml
index 06e207513..d23d3ea68 100644
--- a/.github/workflows/docs_upload.yml
+++ b/.github/workflows/docs_upload.yml
@@ -13,21 +13,10 @@ jobs:
     continue-on-error: true
     if: github.repository == 'cvc5/cvc5' && github.event.workflow_run.conclusion == 'success'
     steps:
-      - name: Setup Deploy Key
-        env:
-            SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-        run: |
-            ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-            ssh-add - <<< "${{ secrets.CVC5_DOCS_TOKEN }}"
-            ssh-add - <<< "${{ secrets.CVC5_DOCS_RELEASE_TOKEN }}"
-
-      - name: Clone Documentation Repository
-        env:
-            SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+      - name: Setup git config
         run: |
           git config --global user.email "docbot@cvc5"
           git config --global user.name "DocBot"
-          git clone git@github.com:cvc5/docs-ci.git target/
       
       - name: Download artifact
         uses: actions/github-script@v3.1.0
@@ -62,7 +51,7 @@ jobs:
       - name: Setup Context
         run: |
           HASH=${{ github.event.workflow_run.head_commit.id }}
-          ISTAG=${{ endsWith(github.ref, github.event.workflow_run.head_branch) }}
+          ISTAG=${{ github.ref_name != github.event.workflow_run.head_branch }}
           if [ "$ISTAG" = true ] ; then
             NAME=${{ github.event.workflow_run.head_branch }}
             echo "Identified tag $NAME"
@@ -81,10 +70,12 @@ jobs:
 
       - name: Update docs
         continue-on-error: true
-        env:
-            SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           if [ -n "$NAME" ]; then
+            eval $(ssh-agent -s)
+            ssh-add - <<< "${{ secrets.CVC5_DOCS_TOKEN }}"
+
+            git clone git@github.com:cvc5/docs-ci.git target/
             cp -r docs-new target/docs-$NAME-$HASH
             cd target/
 
@@ -110,10 +101,11 @@ jobs:
 
       - name: Update docs for release
         continue-on-error: true
-        env:
-            SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           if [ "$ISTAG" = true ]; then
+            eval $(ssh-agent -s)
+            ssh-add - <<< "${{ secrets.CVC5_DOCS_RELEASE_TOKEN }}"
+
             git clone git@github.com:cvc5/docs-releases.git target-releases/
             cp -r docs-new target-releases/$NAME
             cd target-releases/