Merge pull request linode#6851 from nmelehan/v1.305.0

[Release] v1.305.0
nmelehan · Feb 16, 2024 · 2f9d66a · 2f9d66a
2 parents f4b4557 + f328403
commit 2f9d66a
Show file tree

Hide file tree

Showing 3 changed files with 282 additions and 73 deletions.
diff --git a/.github/workflows/deploy-to-feature-testing-server.yaml b/.github/workflows/deploy-to-feature-testing-server.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'feature/testing-linodedocs'
-      - 'cicd-sftp-update'
 
 # This workflow builds the site with Hugo, uploads it to a testing web
 # server, and updates the sandbox Algolia app to reflect the content in the
@@ -370,8 +369,8 @@ jobs:
             echo "Commit hash of workflow run is $GITHUB_SHA, but commit hash reported by server is $CURRENT_GIT_COMMIT_HASH.  Deployment to server has failed. Please inspect workflow logs and server logs."
             exit 1
           fi
-
         else
+          rm cacert.pem
           echo "No gitcommithash.txt exists on server after deployment. Deployment to server has failed. Please inspect workflow logs and server logs."
           exit 1
         fi
diff --git a/.github/workflows/deploy-to-main-staging-server.yaml b/.github/workflows/deploy-to-main-staging-server.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'cicd-sftp-update'
 
 # This workflow builds the site with Hugo, uploads it to a staging web
 # server, and updates the sandbox Algolia app to reflect the content in the
@@ -370,8 +369,8 @@ jobs:
             echo "Commit hash of workflow run is $GITHUB_SHA, but commit hash reported by server is $CURRENT_GIT_COMMIT_HASH.  Deployment to server has failed. Please inspect workflow logs and server logs."
             exit 1
           fi
-
         else
+          rm cacert.pem
           echo "No gitcommithash.txt exists on server after deployment. Deployment to server has failed. Please inspect workflow logs and server logs."
           exit 1
         fi