Updated contents
This commit is contained in:
parent
8d676a1f14
commit
f483f71a82
2 changed files with 16 additions and 11 deletions
|
|
@ -20,20 +20,25 @@ bower install
|
||||||
* Serve files
|
* Serve files
|
||||||
```
|
```
|
||||||
jekyll serve
|
jekyll serve
|
||||||
|
# Serve starts a small webserver with your site on http://localhost:4000 for testing
|
||||||
|
```
|
||||||
|
* Build files
|
||||||
|
```
|
||||||
|
jekyll build
|
||||||
|
# Build generates the HTML/JS/CSS into _site/
|
||||||
|
```
|
||||||
|
* Commit/Push changes to master or other branch. **NOTE** Optimally, all changes would be done in a separated branch and then merged per Pull-Request into master.
|
||||||
|
```
|
||||||
|
git add --all .
|
||||||
|
git commit -m "Changed this and that"
|
||||||
|
git push
|
||||||
```
|
```
|
||||||
|
|
||||||
### Deployment
|
### Deployment
|
||||||
|
|
||||||
* Build files
|
* SSH into scopesessions.org and pull the changes from master.
|
||||||
```
|
|
||||||
jekyll build
|
|
||||||
```
|
|
||||||
* SSH into scopesessions.org and pull the changes from master
|
|
||||||
```
|
```
|
||||||
cd /var/www/vhosts/scopesessions.org
|
cd /var/www/vhosts/scopesessions.org
|
||||||
|
git checkout master
|
||||||
git pull
|
git pull
|
||||||
```
|
```
|
||||||
|
|
||||||
**NOTE:** There are two branches:
|
|
||||||
* master: production code, always keep functional and error-free
|
|
||||||
* dev: development branch, merge to master when production-ready
|
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@
|
||||||
</description>
|
</description>
|
||||||
<link>http://scopesessions.org/</link>
|
<link>http://scopesessions.org/</link>
|
||||||
<atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" />
|
<atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" />
|
||||||
<pubDate>Thu, 16 Apr 2015 12:46:17 +0200</pubDate>
|
<pubDate>Thu, 16 Apr 2015 13:30:24 +0200</pubDate>
|
||||||
<lastBuildDate>Thu, 16 Apr 2015 12:46:17 +0200</lastBuildDate>
|
<lastBuildDate>Thu, 16 Apr 2015 13:30:24 +0200</lastBuildDate>
|
||||||
<generator>Jekyll v2.5.2</generator>
|
<generator>Jekyll v2.5.2</generator>
|
||||||
|
|
||||||
<item>
|
<item>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue