diff --git a/README.md b/README.md index a6d2afb..d062afc 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,14 @@ To run the site locally you can do the following: * Download [Hugo extended edition](https://github.com/gohugoio/hugo/releases/) (named hugo_extended). * Check out repo -* Run `hugo serve -D --gc -w -F` (add -F to show content with future dates) +* Run `hugo serve -D --gc -w -F` (add -F to show content with future dates) or `make serve` (if you have `make` installed) * Goto `http://localhost:1313/` -The site will be updated in realtime with any changes made to the site. +The site will be updated in real-time with any changes made to the site. + +## Making Changes + +All changes to the website must be done on a branch and pushed through the GitHub pull requests workflow. If you have any questions about this process then contact the [Tech Infrastructure](https://wiki.leighhack.org/membership/useful_contacts/#tech-infrastructure) people. ## New Blog Post diff --git a/tools/branch-deploy.sh b/tools/branch-deploy.sh index 337fb80..a2bfb9c 100755 --- a/tools/branch-deploy.sh +++ b/tools/branch-deploy.sh @@ -3,22 +3,20 @@ # Useful for deploying all PRs/branches of a Hugo installation to a test URL for viewing. set -u -# Args: folder +# Args: folder, baseurl TARGET_FOLDER=$(realpath $1) -URL_BASE="$2" +BASE_URL="$2" -INDEX_PAGE="${TARGET_FOLDER}/index.html" mkdir -p "${TARGET_FOLDER}" # Track all remote branches locally +git remote prune origin > /dev/null git branch -r | grep -v '\->' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | while read remote; do git branch --track "${remote#origin/}" "$remote" >/dev/null 2>&1; done # Pull the branches git pull --all > /dev/null git fetch --all > /dev/null -echo -e "

Branches

\n