Merge branch 'dev'
continuous-integration/drone/push Build is failing Details

drafts
Nick Dumas 5 months ago
commit c8493e66a8

@ -1,5 +1,6 @@
kind: pipeline kind: pipeline
name: blog name: blog
type: docker
clone: clone:
depth: 1 depth: 1
@ -8,7 +9,7 @@ steps:
- name: hugo - name: hugo
image: code.ndumas.com/ndumas/hugo image: code.ndumas.com/ndumas/hugo
commands: commands:
- hugo -d /drone/src/public/ - hugo -d /drone/src/public/ --baseUrl https://blog.ndumas.com
- name: publish - name: publish
depends_on: depends_on:
- hugo - hugo
@ -23,3 +24,63 @@ steps:
source: /drone/src/public/ source: /drone/src/public/
target: /var/www/blog.ndumas.com/ target: /var/www/blog.ndumas.com/
include: ["*"] 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

@ -1 +1,6 @@
<<<<<<< HEAD
<script defer data-domain="blog.ndumas.com" src="https://analytics.ndumas.com/js/script.js"></script> <script defer data-domain="blog.ndumas.com" src="https://analytics.ndumas.com/js/script.js"></script>
||||||| 91f5123
=======
<script defer data-domain="{{ index .Site.Params.AnalyticsURL urls.AbsURL}}" src="https://analytics.ndumas.com/js/script.js"></script>
>>>>>>> dev

Loading…
Cancel
Save