2
0
mirror of https://github.com/offen/website.git synced 2024-11-22 17:10:29 +01:00

Merge branch 'development' of https://github.com/offen/homepage into development

This commit is contained in:
Hendrik Niefeld 2019-05-31 17:35:58 +02:00
commit 4c5a71dd60
4 changed files with 6 additions and 10 deletions

View File

@ -12,17 +12,13 @@ jobs:
- TARGET_BRANCH: gh-pages - TARGET_BRANCH: gh-pages
steps: steps:
- checkout - checkout
- run:
name: Install deps
command: |
python -m venv venv
source venv/bin/activate
pip install --user -r requirements.txt
- deploy: - deploy:
name: Deploy name: Deploy
command: | command: |
if [ $CIRCLE_BRANCH == $SOURCE_BRANCH ]; then if [ $CIRCLE_BRANCH == $SOURCE_BRANCH ]; then
python -m venv venv
source venv/bin/activate source venv/bin/activate
pip install -r requirements.txt
git config --global user.email $GH_EMAIL git config --global user.email $GH_EMAIL
git config --global user.name $GH_NAME git config --global user.name $GH_NAME

View File

@ -75,7 +75,7 @@ __offen__ is created by [Frederik Ring][frederik-ring]{: target="_blank"} and [H
We are happy about any kind of feedback. From *criticism and praise to contributions or support*, everything is welcome. We are happy about any kind of feedback. From *criticism and praise to contributions or support*, everything is welcome.
<a href="/index.html" class="btn">Summary</a> <a href="../" class="btn">Summary</a>
--- ---

View File

@ -10,4 +10,4 @@ __offen__ treats both users and operators as parties of equal importance. Users
__offen__ is currently being conceptually designed and is applying for funds to sustain its development. __offen__ is currently being conceptually designed and is applying for funds to sustain its development.
<a href="/deep-dive/" class="btn">Deep dive</a> <a href="./deep-dive/" class="btn">Deep dive</a>

View File

@ -11,7 +11,7 @@ sys.path.append(os.curdir)
from pelicanconf import * from pelicanconf import *
# If your site is available via HTTPS, make sure SITEURL begins with https:// # If your site is available via HTTPS, make sure SITEURL begins with https://
SITEURL = 'https://www.offen.dev' SITEURL = 'https://www.offen.dev/homepage'
RELATIVE_URLS = False RELATIVE_URLS = False
FEED_ALL_ATOM = 'feeds/all.atom.xml' FEED_ALL_ATOM = 'feeds/all.atom.xml'
@ -22,4 +22,4 @@ DELETE_OUTPUT_DIRECTORY = True
# Following items are often useful when publishing # Following items are often useful when publishing
#DISQUS_SITENAME = "" #DISQUS_SITENAME = ""
#GOOGLE_ANALYTICS = "" #GOOGLE_ANALYTICS = ""