From 1bd65535031686e312977a499db80ad1768b3f88 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sat, 9 Feb 2019 11:43:48 -0600
Subject: [PATCH 1/5] Making develop a required build in CI

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76b2585..ef11cbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ build-website:
     - tar -czvf website.tgz -C /output/ .
   only:
     - master
+    - develop
   tags:
     - docker
   artifacts:

From 1b1ce70f23801627c0e5f2e0ad16d1114799faaa Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sat, 9 Feb 2019 12:09:40 -0600
Subject: [PATCH 2/5] Added blog link to the menu

---
 config.toml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/config.toml b/config.toml
index 865ee23..2eeaca4 100644
--- a/config.toml
+++ b/config.toml
@@ -7,20 +7,29 @@ theme = "pure"
 CopyrightHolder = "Drew Short"
 CopyrightYear = "2014"
 [params.links]
+
+[params.links.blog]
+weight = 40
+title = "Blog"
+url = "https://blog.nulloctet.com"
+
 [params.links.resume]
-weight = 10
+weight = 30
 title = "Résumé"
 url = "https://sothr.com/resume/"
+
 [params.links.gitlab]
-weight = 2
+weight = 20
 title = "GitLab"
 image = "assets/img/gitlab.svg"
 url = "https://gitlab.com/WarrickSothr"
+
 [params.links.github]
-weight = 1
+weight = 10
 title = "GitHub"
 image = "assets/img/github.png"
 url = "https://github.com/warricksothr/"
+
 [params.links.linkedin]
 title = "LinkedIn"
 image = "assets/img/linkedin.png"

From ad15df3e94195e580f292295d0ef193f58017f09 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sat, 9 Feb 2019 12:18:32 -0600
Subject: [PATCH 3/5] Added deployment dependency

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef11cbc..29f023d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,8 @@ deploy-website:
     - rsync -avz --delete-delay -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $DEPLOY_PORT" --progress /tmp/deploy/* $DEPLOY_USER@$DEPLOY_HOST:$TARGET_DIRECTORY
   only:
     - master
+  dependencies:
+    - build-website
   tags:
     - docker
   environment: production

From d28dadf0240dc8009aa9e9716b6d14d9dc12f7c3 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sat, 9 Feb 2019 12:24:06 -0600
Subject: [PATCH 4/5] Make sure artifacts expire

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29f023d..dbd7d7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,12 @@ build-website:
     - develop
   tags:
     - docker
+  keep:
+
   artifacts:
     paths:
     - website.tgz
+    expire_in: 1 week
  
 deploy-website:
   image: sothr.com/deploy:ubuntu

From 392e4d8b825299adbd469aa660456daf92249da6 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sat, 9 Feb 2019 12:42:44 -0600
Subject: [PATCH 5/5] Fix gitlab-ci

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbd7d7b..2fc2038 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,6 @@ build-website:
     - develop
   tags:
     - docker
-  keep:
-
   artifacts:
     paths:
     - website.tgz