Ok, I think I am following your updates now after rereading, Randall.
However, what this means to me is that every time a blog article is
added, there will be a commit in both the master branch and gh-pages
branch that would need to be pulled reflecting changes in the jekyll
source and jekyll destination files. This is fine, but it brings up a
bit of an opportunity for master and gh-pages to be unsynced if
corresponding pull requests are not made at the same time. I understand
the motivations for keeping source files out of the gh-pages branch, so
I think doing it this way is fine until it possibly becomes a headache.
Steph
On 5/14/2014 9:52 PM, Steph Skardal wrote:
As it stands right now in it's current state, annotatorjs.org/news/
has not been built and is coming up empty on the live site.
Perhaps I'm misunderstanding the intention here, but it's my
understanding now that we want _news (the source) to be committed to
the master branch, and news (the destination) to be committed to
gh-pages, and the tricky/annoying part is that we'll have to toggle
between branches to keep _news committed to master and news committed
to gh-pages.
Steph
On 5/14/2014 8:44 PM, Randall Leeds wrote:
Steph, Andrew, thanks for making and merging those commits to get a
news page up!
I'm totally obsessive about not committing source to the gh-pages and
not commit build artifacts to master, though, so I've gone ahead and
push a master branch that features a new rake task.
Here are the differences between master and gh-pages:
- JEKYLL_README is now in _news/
- There's a new rake task you can run in _news/, `rake ghp` (ghp ==
gh-pages)
What the ghp task does:
- Ensures there are no untracked, unignored files present
- Ensures there are no uncommitted working directory or index changes
- Creates a new commit on top of the gh-pages branch containing the
latest files
Everything is copied over for now, except _news/.
I'm happy to help turn everything into jekyll and we can just run
these commands from the root.
Jekyll has no problem with .html files in the root, so I think it's
as simple as making _news/index.html into news.html at the root and
popping everything up a directory.
I've not updated the gh-pages branch myself, yet, in case someone
doesn't like what I've done (we can drop the master branch, which
wasn't present before).
If you'd like to be the first, just follow the instructions!
_news/JEKYLL_README has all the latest.
_______________________________________________
annotator-dev mailing list
[email protected]
https://lists.okfn.org/mailman/listinfo/annotator-dev
Unsubscribe:https://lists.okfn.org/mailman/options/annotator-dev
_______________________________________________
annotator-dev mailing list
[email protected]
https://lists.okfn.org/mailman/listinfo/annotator-dev
Unsubscribe: https://lists.okfn.org/mailman/options/annotator-dev
_______________________________________________
annotator-dev mailing list
[email protected]
https://lists.okfn.org/mailman/listinfo/annotator-dev
Unsubscribe: https://lists.okfn.org/mailman/options/annotator-dev
