diff --git a/.drone.yml b/.drone.yml index a1887d6..13735c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -288,6 +288,18 @@ depends_on: - amd64-docker-git - arm64-docker-git - armhf-docker-git +trigger: + branch: + - main + - go1.16 + event: + exclude: + - pull_request + +volumes: + - name: ssh_key + host: + path: /root/.ssh/docker-build --- name: jfa-go-pr kind: pipeline diff --git a/config.go b/config.go index c7e083c..e9db6ea 100644 --- a/config.go +++ b/config.go @@ -38,7 +38,6 @@ func (app *appContext) loadConfig() error { app.config.Section("invite_emails").Key("email_text").SetValue(app.config.Section("invite_emails").Key("email_text").MustString(filepath.Join(app.localPath, "invite-email.txt"))) app.config.Section("email_confirmation").Key("email_html").SetValue(app.config.Section("email_confirmation").Key("email_html").MustString(filepath.Join(app.localPath, "confirmation.html"))) - fmt.Println(app.config.Section("email_confirmation").Key("email_html").String()) app.config.Section("email_confirmation").Key("email_text").SetValue(app.config.Section("email_confirmation").Key("email_text").MustString(filepath.Join(app.localPath, "confirmation.txt"))) app.config.Section("notifications").Key("expiry_html").SetValue(app.config.Section("notifications").Key("expiry_html").MustString(filepath.Join(app.localPath, "expired.html")))