Move deploy.sh

.github/workflows/deploy.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-# Run this script to deploy the app to Github Pages
-
-# Parse cmd arguments
-
 SRC_BRANCH="master"
 DEPLOY_BRANCH="gh-pages"
 
@@ -44,7 +40,6 @@ while [[ $# > 0 ]]; do
     shift
 done
 
-# Exit if any subcommand fails
 set -e
 
 echo "Deploying..."
@@ -58,7 +53,6 @@ then
     [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Check if there are any uncommitted changes
 if ! git diff-index --quiet HEAD --; then
     echo "Changes to the following files are uncommitted:"
     git diff-index --name-only HEAD --
@@ -67,7 +61,6 @@ if ! git diff-index --quiet HEAD --; then
     [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Check if there are any untracked files
 if ! test -z "$(git ls-files --exclude-standard --others)"; then
     echo "There are untracked files:"
     git ls-files --exclude-standard --others
@@ -76,7 +69,6 @@ if ! test -z "$(git ls-files --exclude-standard --others)"; then
     [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
-# Switch to source branch (creates it if necessary from the current branch)
 if [ `git branch | grep $SRC_BRANCH | tr ' ' '\n' | tail -1` ]
 then
     git checkout $SRC_BRANCH
@@ -84,27 +76,22 @@ else
     git checkout -b $SRC_BRANCH
 fi
 
-# Checkout DEPLOY_BRANCH branch
 if [ `git branch | grep $DEPLOY_BRANCH` ]
 then
   git branch -D $DEPLOY_BRANCH
 fi
 git checkout -b $DEPLOY_BRANCH
 
-# Build site
 bundle exec jekyll build
 
-# Delete and move files
 find . -maxdepth 1 ! -name '_site' ! -name '.git' ! -name 'CNAME' ! -name '.gitignore' -exec rm -rf {} \;
 mv _site/* .
 rm -R _site/
 
-# Push to DEPLOY_BRANCH
 git add -fA
 git commit --allow-empty -m "$(git log -1 --pretty=%B) [ci skip]"
 [[ ${NO_PUSH} ]] || git push -f -q origin $DEPLOY_BRANCH
 
-# Move back to SRC_BRANCH
 git checkout $SRC_BRANCH
 
 echo "Deployed successfully!"

.github/workflows/deploy.yml

@@ -46,6 +46,6 @@ jobs:
         fi
         echo "::set-output name=DEPLOY_BRANCH::gh-pages"
     - name: Deploy website 
-      run:  yes | bin/deploy.sh --verbose ${{ steps.setup.outputs.NO_PUSH }}
+      run:  yes | .github/workflows/deploy.sh --verbose ${{ steps.setup.outputs.NO_PUSH }}
                     --src ${{ steps.setup.outputs.SRC_BRANCH }} 
                     --deploy ${{ steps.setup.outputs.DEPLOY_BRANCH }}