From ed32c024ded699a7b0847a0e5cc74c8fa5c917b3 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 22 Mar 2019 09:45:32 -0400 Subject: [PATCH] (GH-223) .travis.yml does not deploy by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this patch, the TravisCI configuration will be broken and add a deployment section with the incorrect password and without documentation to explain how to do deploys correctly. Co-authored-by: Garrett Honeycutt Co-authored-by: Tibor Répási --- README.md | 2 ++ config_defaults.yml | 2 -- moduleroot/.travis.yml.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 305a33b3..f1036ece 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,8 @@ Travis uses a .travis.yml file in the root of your repository to learn about you |remove_branches |Allows you to remove default branches set in config_defaults.yml.| |notifications |Allows you to specify the notifications configuration in the .travis.yml file.| |remove_notifications |Allows you to remove default branches set in config_defaults.yml.| +|user|This string needs to be set to the Puppet Forge user name. To enable deployment the secure key also needs to be set.| +|secure|This string needs to be set to the encrypted password to enable deployment. See [https://docs.travis-ci.com/user/encryption-keys/#usage](https://docs.travis-ci.com/user/encryption-keys/#usage) for instructions on how to encrypt your password.| ### .yardopts diff --git a/config_defaults.yml b/config_defaults.yml index 9ee16164..d406e022 100644 --- a/config_defaults.yml +++ b/config_defaults.yml @@ -85,8 +85,6 @@ stage: spec - env: DEPLOY_TO_FORGE=yes stage: deploy - deploy: true - user: 'puppet' branches: - master - /^v\d/ diff --git a/moduleroot/.travis.yml.erb b/moduleroot/.travis.yml.erb index b7a85f6e..32907c69 100644 --- a/moduleroot/.travis.yml.erb +++ b/moduleroot/.travis.yml.erb @@ -114,7 +114,7 @@ notifications: <% end -%> <% end -%> <% end -%> -<% if @configs['deploy'] -%> +<% unless @configs['user'].nil? || @configs['secure'].nil? -%> deploy: provider: puppetforge user: <%= @configs['user'] %>