Browse Source

Move documenation build step last in CI. Refactor docs build scripts.

Dan Helfman 6 years ago
parent
commit
bc4fb322b5
5 changed files with 24 additions and 28 deletions
  1. 17 17
      .drone.yml
  2. 1 0
      NEWS
  3. 6 0
      scripts/dev-docs
  4. 0 5
      scripts/docs/build
  5. 0 6
      scripts/docs/push

+ 17 - 17
.drone.yml

@@ -1,22 +1,5 @@
 ---
 kind: pipeline
-name: documentation
-
-steps:
-- name: build
-  image: plugins/docker
-  settings:
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    repo: witten/borgmatic-docs
-    dockerfile: docs/Dockerfile
-  when:
-    branch:
-      - master
----
-kind: pipeline
 name: python-3-5-alpine-3-9
 
 steps:
@@ -55,3 +38,20 @@ steps:
   pull: always
   commands:
     - scripts/run-tests
+---
+kind: pipeline
+name: documentation
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: witten/borgmatic-docs
+    dockerfile: docs/Dockerfile
+  when:
+    branch:
+      - master

+ 1 - 0
NEWS

@@ -5,6 +5,7 @@
  * Add Borg/borgmatic hosting providers section to documentation.
  * Add files for building documentation into a Docker image for web serving.
  * Upgrade project build server from Drone 0.8 to 1.1.
+ * Build borgmatic documentation during continuous integration.
 
 1.3.5
  * #153: Support for various Borg directory environment variables (BORG_CONFIG_DIR, BORG_CACHE_DIR,

+ 6 - 0
scripts/dev-docs

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+docker build --tag borgmatic-docs --file docs/Dockerfile .
+docker run --interactive --tty --publish 8080:80 --rm borgmatic-docs

+ 0 - 5
scripts/docs/build

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-docker build --tag witten/borgmatic-docs --file docs/Dockerfile .

+ 0 - 6
scripts/docs/push

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. scripts/docs/build
-docker push witten/borgmatic-docs