From 817abdff3642632c682cc8dc535635a83984da62 Mon Sep 17 00:00:00 2001
From: Standing With Resilience <standing.with.resilience@riseup.net>
Date: Sun, 28 Aug 2016 07:15:15 +0000
Subject: Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..513da4d
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,19 @@
+image: elecnix/ikiwiki
+
+test:
+  stage: test
+  script:
+  - cd backend; ikiwiki --setup ikiwiki.setup
+  only:
+  - branches
+  - tags
+
+pages:
+  stage: deploy
+  script:
+  - cd backend; ikiwiki --setup ikiwiki.setup
+  artifacts:
+    paths:
+    - html
+  only:
+  - master
-- 
cgit v1.2.3


From 4a5379bff8dbc0e8f7cfc1247b9de52765aad6ac Mon Sep 17 00:00:00 2001
From: Standing With Resilience <standing.with.resilience@riseup.net>
Date: Sun, 28 Aug 2016 07:28:22 +0000
Subject: Update .gitlab-ci.yml to output to /public

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 513da4d..14cf22c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: elecnix/ikiwiki
 test:
   stage: test
   script:
-  - cd backend; ikiwiki --setup ikiwiki.setup
+  - cd backend; ikiwiki --setup ikiwiki.setup ../wiki ../public
   only:
   - branches
   - tags
@@ -11,9 +11,9 @@ test:
 pages:
   stage: deploy
   script:
-  - cd backend; ikiwiki --setup ikiwiki.setup
+  - cd backend; ikiwiki --setup ikiwiki.setup ../wiki ../public
   artifacts:
     paths:
-    - html
+    - public
   only:
   - master
-- 
cgit v1.2.3


From e644d6767281612dd2b6a2e362f4c440503ee241 Mon Sep 17 00:00:00 2001
From: Standing With Resilience <standing.with.resilience@riseup.net>
Date: Sun, 28 Aug 2016 07:33:47 +0000
Subject: Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14cf22c..adbc034 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,13 @@
 image: elecnix/ikiwiki
 
+before_script:
+  - apt-get install -y curl
+
 test:
   stage: test
   script:
-  - cd backend; ikiwiki --setup ikiwiki.setup ../wiki ../public
+  - cd backend; ikiwiki --setup ikiwiki.setup
+  - mv html public
   only:
   - branches
   - tags
@@ -11,7 +15,8 @@ test:
 pages:
   stage: deploy
   script:
-  - cd backend; ikiwiki --setup ikiwiki.setup ../wiki ../public
+  - cd backend; ikiwiki --setup ikiwiki.setup
+  - mv html public
   artifacts:
     paths:
     - public
-- 
cgit v1.2.3


From bcd172a1393faa4742ae970ba85d99cf4afcf552 Mon Sep 17 00:00:00 2001
From: Standing With Resilience <standing.with.resilience@riseup.net>
Date: Sun, 28 Aug 2016 07:36:31 +0000
Subject: Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adbc034..304052c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 image: elecnix/ikiwiki
 
 before_script:
+  - apt-get update
   - apt-get install -y curl
 
 test:
-- 
cgit v1.2.3


From 23de050ac131c1d3b5fc7ed0b5bb0b43dd6a31c3 Mon Sep 17 00:00:00 2001
From: Standing With Resilience <standing.with.resilience@riseup.net>
Date: Sun, 28 Aug 2016 07:39:09 +0000
Subject: Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 304052c..d1b4ae4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,9 @@ before_script:
 test:
   stage: test
   script:
-  - cd backend; ikiwiki --setup ikiwiki.setup
+  - cd backend
+  - ikiwiki --setup ikiwiki.setup
+  - cd ..
   - mv html public
   only:
   - branches
@@ -16,7 +18,9 @@ test:
 pages:
   stage: deploy
   script:
-  - cd backend; ikiwiki --setup ikiwiki.setup
+  - cd backend
+  - ikiwiki --setup ikiwiki.setup
+  - cd ..
   - mv html public
   artifacts:
     paths:
-- 
cgit v1.2.3