Skip to content

Commit

Permalink
remove old gh-pages publishing workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
iandennismiller committed Sep 22, 2023
1 parent 564896a commit 1f492e4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 30 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
/.bundle/
.DS_Store
Gemfile.lock
/_gh-pages
31 changes: 11 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
# Website Makefile

JEKYLL_CMD=docker run --rm --name jekyll -it -v $$PWD:/srv/jekyll iandennismiller/jekyll:latest
JEKYLL_CMD=docker run --rm --name jekyll -it -v $$PWD:/srv/jekyll
JEKYLL_PORT=-p 4000:4000
JEKYLL_IMAGE=iandennismiller/jekyll:latest

help:
@echo The following makefile targets are available:
@echo
@grep -h -e '^\w\S\+\:' Makefile _dev/*.mk | sed 's/://g' | cut -d ' ' -f 1

publish: clean build
rsync -av --delete --checksum --exclude .git _site/ _gh-pages/
cd _gh-pages && git add -A && git commit -am "automatic publish" && git push
@echo ok

serve:
docker run \
--rm -it \
--name jekyll \
-v $$PWD:/srv/jekyll \
-p 4000:4000 \
iandennismiller/jekyll:latest \
$(JEKYLL_CMD) $(JEKYLL_PORT) $(JEKYLL_IMAGE) \
/bin/bash -c 'bundle exec jekyll serve --host 0.0.0.0'

clean:
$(JEKYLL_CMD) /bin/bash -c 'bundle exec jekyll clean'
$(JEKYLL_CMD) $(JEKYLL_IMAGE) /bin/bash -c 'bundle exec jekyll clean'

incremental: clean
$(JEKYLL_CMD) /bin/bash -c 'JEKYLL_ENV=production bundle exec jekyll build --incremental'
$(JEKYLL_CMD) $(JEKYLL_IMAGE) \
/bin/bash -c 'JEKYLL_ENV=production bundle exec jekyll build --incremental'

build:
$(JEKYLL_CMD) /bin/bash -c 'JEKYLL_ENV=production bundle exec jekyll build'

shell-docker:
$(JEKYLL_CMD) /bin/bash
$(JEKYLL_CMD) $(JEKYLL_IMAGE) \
/bin/bash -c 'JEKYLL_ENV=production bundle exec jekyll build'

.PHONY: docs
shell:
$(JEKYLL_CMD) $(JEKYLL_IMAGE) /bin/bash
9 changes: 0 additions & 9 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,3 @@ I wanted to make something simple to navigate, while providing a little bit of i
- [ ] The Passive Solar Primer - by David Wright
- [ ] The Shelter books - by Louis Khan
- [ ] The original Whole Earth Catalog - published by Stewart Brand

## Setup Notes

Initialize the _gh-pages branch to support the publishing workflow.

```bash
echo /_gh-pages >> .gitignore
git clone git@github.com:iandennismiller/solarpunk.git -b gh-pages _gh-pages
```

0 comments on commit 1f492e4

Please sign in to comment.