diff --git a/.drone.yml b/.drone.yml index a089d2e..d1e3b19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,6 @@ kind: pipeline name: blog +type: docker clone: depth: 1 @@ -8,7 +9,7 @@ steps: - name: hugo image: code.ndumas.com/ndumas/hugo commands: - - hugo -d /drone/src/public/ + - hugo -d /drone/src/public/ --baseUrl https://blog.ndumas.com - name: publish depends_on: - hugo @@ -23,3 +24,63 @@ steps: source: /drone/src/public/ target: /var/www/blog.ndumas.com/ include: ["*"] +branches: +- main +--- +kind: pipeline +name: dev +type: docker + +clone: + depth: 1 + +steps: +- name: hugo + image: code.ndumas.com/ndumas/hugo + commands: + - hugo -d /drone/src/public/ --baseUrl https://dev.blog.ndumas.com +- name: publish + depends_on: + - hugo + image: drillster/drone-rsync + settings: + key: + from_secret: BLOG_DEPLOY_KEY + user: blog + delete: true + recursive: true + hosts: ["blog.ndumas.com"] + source: /drone/src/public/ + target: /var/www/dev.blog.ndumas.com/ + include: ["*"] +branches: +- dev +--- +kind: pipeline +name: drafts +type: docker + +clone: + depth: 1 + +steps: +- name: hugo + image: code.ndumas.com/ndumas/hugo + commands: + - hugo -DF -d /drone/src/public/ --baseUrl https://drafts.blog.ndumas.com +- name: publish + depends_on: + - hugo + image: drillster/drone-rsync + settings: + key: + from_secret: BLOG_DEPLOY_KEY + user: blog + delete: true + recursive: true + hosts: ["blog.ndumas.com"] + source: /drone/src/public/ + target: /var/www/drafts.blog.ndumas.com/ + include: ["*"] +branches: +- dev diff --git a/layouts/partials/extend-head.html b/layouts/partials/extend-head.html index b4f6b3d..4d20a49 100644 --- a/layouts/partials/extend-head.html +++ b/layouts/partials/extend-head.html @@ -1 +1,6 @@ +<<<<<<< HEAD +||||||| 91f5123 +======= + +>>>>>>> dev