From fb34f1ae495bfda1d8761c40619afedf5a52f70a Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 31 May 2019 17:22:09 +0200 Subject: [PATCH 1/3] install dependencies in deploy step --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d155ed3..069aa68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,16 +12,13 @@ jobs: - TARGET_BRANCH: gh-pages steps: - checkout - - run: - name: Install deps - command: | - python -m venv venv - source venv/bin/activate - pip install --user -r requirements.txt - deploy: name: Deploy command: | if [ $CIRCLE_BRANCH == $SOURCE_BRANCH ]; then + python -m venv venv + source venv/bin/activate + pip install --user -r requirements.txt source venv/bin/activate git config --global user.email $GH_EMAIL From d912d0b2f44d3f3b27db54de6055bda98c299314 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 31 May 2019 17:29:06 +0200 Subject: [PATCH 2/3] do not install as user --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 069aa68..622edfb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,8 +18,7 @@ jobs: if [ $CIRCLE_BRANCH == $SOURCE_BRANCH ]; then python -m venv venv source venv/bin/activate - pip install --user -r requirements.txt - source venv/bin/activate + pip install -r requirements.txt git config --global user.email $GH_EMAIL git config --global user.name $GH_NAME From 46f5a066db754d459be54d119a4a830aa2c83f4e Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 31 May 2019 17:32:02 +0200 Subject: [PATCH 3/3] update site url --- content/pages/deep-dive.md | 2 +- content/pages/index.md | 2 +- publishconf.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/pages/deep-dive.md b/content/pages/deep-dive.md index 552d157..bfd3fb3 100644 --- a/content/pages/deep-dive.md +++ b/content/pages/deep-dive.md @@ -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. -Summary +Summary --- diff --git a/content/pages/index.md b/content/pages/index.md index 0d50b87..0c18a23 100644 --- a/content/pages/index.md +++ b/content/pages/index.md @@ -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. -Deep dive +Deep dive diff --git a/publishconf.py b/publishconf.py index a656c71..77cc73f 100644 --- a/publishconf.py +++ b/publishconf.py @@ -11,7 +11,7 @@ sys.path.append(os.curdir) from pelicanconf import * # 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 FEED_ALL_ATOM = 'feeds/all.atom.xml' @@ -22,4 +22,4 @@ DELETE_OUTPUT_DIRECTORY = True # Following items are often useful when publishing #DISQUS_SITENAME = "" -#GOOGLE_ANALYTICS = "" \ No newline at end of file +#GOOGLE_ANALYTICS = ""