From 49d5646b1580d5ea1aaae9c03c980fb4e0a89b71 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Wed, 13 Mar 2019 23:45:59 +0100
Subject: [PATCH 1/3] Allow specifying per-branch parameters

---
 .gitlab-ci.yml | 2 +-
 .hugo-params   | 0
 build.sh       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 .hugo-params

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57cf02a..a7bf1d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build_pages:
     untracked: true
   script:
     - apk add --no-cache --upgrade hugo
-    - hugo
+    - hugo $(cat .hugo-params)
 
 build_calendar:
   image: "python:3.7-alpine3.8"
diff --git a/.hugo-params b/.hugo-params
new file mode 100644
index 0000000..e69de29
diff --git a/build.sh b/build.sh
index 2229095..4489ab6 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-hugo
+hugo $(cat .hugo-params)
 tools/merge_cals.py
 upcoming="$(tools/gen_upcoming.py static/all.ics 14 5|tr '\n' ' ')"
 cp static/all.ics public/all.ics

From 55d13a94e7203152bde8207070628b819f7c902d Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Wed, 13 Mar 2019 23:48:35 +0100
Subject: [PATCH 2/3] Adjust hugo params for master

---
 .hugo-params | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hugo-params b/.hugo-params
index e69de29..7c49b8b 100644
--- a/.hugo-params
+++ b/.hugo-params
@@ -0,0 +1 @@
+-b https://berlin.ccc.de

From 6d63004173e3a648819593c3b4a4d51908d85e7f Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Thu, 14 Mar 2019 23:01:32 +0100
Subject: [PATCH 3/3] Ensure artifacts expire

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd64f9a..e812b66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ build_pages:
   variables:
     SHELL: "/bin/sh"
   artifacts:
+    expire_in: "1 week"
     untracked: true
   script:
     - apk add --no-cache --upgrade hugo
@@ -28,6 +29,7 @@ build_calendar:
   dependencies: 
     - build_pages
   artifacts:
+    expire_in: "1 week"
     untracked: true
   variables:
     SHELL: "/bin/sh"
@@ -57,6 +59,7 @@ deploy_staging:
     name: staging
     url: https://staging.berlin.ccc.de/
   artifacts:
+    expire_in: "1 week"
     paths:
       - public/
   only:
@@ -81,6 +84,7 @@ deploy_production:
     name: production
     url: https://berlin.ccc.de/
   artifacts:
+    expire_in: "1 week"
     paths:
       - public/
   only: