Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(FM-5815) Prep for 1.3.1 release #189

Merged
merged 2 commits into from Nov 16, 2016
Merged

Conversation

branan
Copy link
Contributor

@branan branan commented Nov 15, 2016

No description provided.

Branan Riley added 2 commits November 15, 2016 15:23
This adds the puppet-blacksmith gem, which is used by our automated
release tooling to ship modules. This also duplicates the `test` group
as `development`, since that is the preferred name going forward. We'll
keep the `test` alias for now, since it doesn't hurt anything.
@branan branan changed the base branch from master to release November 15, 2016 23:54
@MikaelSmith MikaelSmith merged commit 2e8359e into puppetlabs:release Nov 16, 2016
@@ -11,6 +11,7 @@ group :test do
gem 'metadata-json-lint', '~> 0.0'
gem 'rspec-puppet-facts', '~> 1.3'
gem 'semantic_puppet', '0.1.3'
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it might be a problem for Travis.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See https://travis-ci.org/puppetlabs/puppetlabs-puppet_agent/builds/176248555. We should use a PR for merge-up to master to ensure that gets fixed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yup. I'll re-open this without the blacksmith change - we can get it on to master after. This was sort of a preemptive change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait, this is merged, not closed. Nevermind, then!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants