Handle branch deletion

Author: visortelle

.github/workflows/branch-deleted.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          ref: gh-pages
+          ref: hakyll
 
       - name: Remove stale deployments
         run: ./.github/workflows/deployment/delete.sh $GITHUB_REF_NAME

.github/workflows/deployment/commons.sh

@@ -14,3 +14,6 @@ slugify() {
   echo "$1" | iconv -c -t ascii//TRANSLIT | sed -E 's/[~^]+/-/g' | sed -E 's/[^a-zA-Z0-9]+/-/g' | sed -E 's/^-+|-+$/-/g' | tr A-Z a-z
 }
 export -f slugify
+
+git config user.name github-actions
+git config user.email [email protected]

.github/workflows/deployment/delete.sh

@@ -1,13 +1,20 @@
 #!/usr/bin/env bash
 
 # Remove deployment by specified git branch name.
-# Script assumes that you are on gh-pages branch.
 
 set -eo pipefail
 
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 source $script_dir/commons.sh
 
-branch_slug=$($script_dir/slugify.sh $1)
+git checkout gh-pages
+git pull origin gh-pages
 
+branch_slug=$($script_dir/slugify.sh $1)
 rm -rf "$deployments_dir/$branch_slug"
+
+echo "Updating gh-pages branch."
+git add --all
+git commit --allow-empty -m "Delete '${$1}' branch deployment [ci skip]"
+git push --force origin gh-pages
+echo "Deployment for branch '$1' has been deleted."

.github/workflows/deployment/deploy.sh

@@ -7,9 +7,6 @@ set -eo pipefail
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 source $script_dir/commons.sh
 
-git config user.name github-actions
-git config user.email [email protected]
-
 deploy() {
   if [[ ! -z "$GITHUB_REF_NAME" ]]; then
     # The GITHUB_REF_NAME env variable is available in github actions.
@@ -47,7 +44,7 @@ deploy() {
 
   echo "Updating gh-pages branch."
   git add --all
-  git commit --allow-empty -m "[$(date '+%F %T %Z')] Updated site for the '${git_branch}' branch [ci skip]"
+  git commit --allow-empty -m "Update '${git_branch}' branch deployment [ci skip]"
   git push --force origin gh-pages
   echo "Deployment finished."
 }
@@ -86,7 +83,7 @@ update_deployments_list() {
 
   # Update gh-pages branch
   git add --all
-  git commit --allow-empty -m "Update ${deployments_list}"
+  git commit --allow-empty -m "Update ${deployments_list} [ci skip]"
   git push --force origin gh-pages
 }