Skip to content

Commit

Permalink
Merge branch 'master' into certificates
Browse files Browse the repository at this point in the history
  • Loading branch information
schisamo authored Jul 18, 2019
2 parents 57b268b + a6e812d commit c662c4e
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 85 deletions.
5 changes: 5 additions & 0 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,8 @@ promote:
actions:
- built_in:rollover_changelog
- built_in:publish_rubygems

pipelines:
- verify:
description: Pull Request validation tests
public: true
37 changes: 37 additions & 0 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
steps:

- label: run-lint-and-specs-ruby-2.4
command:
- bundle install --jobs=7 --retry=3 --without docs debug
- bundle exec rake
expeditor:
executor:
docker:
image: ruby:2.4-stretch

- label: run-lint-and-specs-ruby-2.5
command:
- bundle install --jobs=7 --retry=3 --without docs debug
- bundle exec rake
expeditor:
executor:
docker:
image: ruby:2.5-stretch

- label: run-lint-and-specs-ruby-2.6
command:
- bundle install --jobs=7 --retry=3 --without docs debug
- bundle exec rake
expeditor:
executor:
docker:
image: ruby:2.6-stretch

- label: run-lint-and-specs-windows
command:
- bundle install --jobs=7 --retry=3 --without docs debug
- bundle exec rake
expeditor:
executor:
docker:
host_os: windows
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ We use GitHub issues to track bugs and feature requests. If you need help please
* Chef Community Slack at http://community-slack.chef.io/.
* Chef Mailing List https://discourse.chef.io/


Support issues opened here will be closed and redirected to Slack or Discourse.
15 changes: 0 additions & 15 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ Artifactory Client CHANGELOG
This file is used to document the changes between releases of the Artifactory
Ruby client.

<!-- latest_release 3.0.1 -->
## [v3.0.1](https://github.com/chef/artifactory-client/tree/v3.0.1) (2019-05-10)
<!-- latest_release 3.0.4 -->
## [v3.0.4](https://github.com/chef/artifactory-client/tree/v3.0.4) (2019-07-18)

#### Merged Pull Requests
- Virtual repos [#109](https://github.com/chef/artifactory-client/pull/109) ([jniesen](https://github.com/jniesen))
- Fix handling of redirection [#107](https://github.com/chef/artifactory-client/pull/107) ([orgads](https://github.com/orgads))
- Added empty string if success response body is nil [#99](https://github.com/chef/artifactory-client/pull/99) ([APayden](https://github.com/APayden))

- Replace AppVeyor with Buildkite as well [#115](https://github.com/chef/artifactory-client/pull/115) ([tas50](https://github.com/tas50))
<!-- latest_release -->

<!-- release_rollup since=3.0.0 -->
### Changes not yet released to rubygems.org

#### Merged Pull Requests
- Replace AppVeyor with Buildkite as well [#115](https://github.com/chef/artifactory-client/pull/115) ([tas50](https://github.com/tas50)) <!-- 3.0.4 -->
- Remove Travis CI pull request testing [#114](https://github.com/chef/artifactory-client/pull/114) ([tas50](https://github.com/tas50)) <!-- 3.0.3 -->
- Setup PR verification with Buildkite [#113](https://github.com/chef/artifactory-client/pull/113) ([tas50](https://github.com/tas50)) <!-- 3.0.2 -->
- Virtual repos [#109](https://github.com/chef/artifactory-client/pull/109) ([jniesen](https://github.com/jniesen))
- Fix handling of redirection [#107](https://github.com/chef/artifactory-client/pull/107) ([orgads](https://github.com/orgads))
- Added empty string if success response body is nil [#99](https://github.com/chef/artifactory-client/pull/99) ([APayden](https://github.com/APayden)) <!-- 3.0.1 -->
Expand Down Expand Up @@ -168,4 +168,4 @@ v1.1.0 (2014-02-11)

v1.0.0 (2014-02-10)
-------------------
- Initial release
- Initial release
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Artifactory Client
[![Gem Version](http://img.shields.io/gem/v/artifactory.svg)][gem] [![Travis Build Status](http://img.shields.io/travis/chef/artifactory-client.svg?label=Travis%20CI)][travis] [![AppVeyor Build Status](http://img.shields.io/appveyor/ci/chef/artifactory-client.svg?label=AppVeyor)][appveyor]

[![Build status](https://badge.buildkite.com/a5156457906e25cbde53c408598d233a202c675c670f4c768d.svg?branch=master)](https://buildkite.com/chef-oss/chef-artifactory-client-master-verify)
[![Gem Version](http://img.shields.io/gem/v/artifactory.svg)][gem]

A Ruby client and interface to the Artifactory API. **The majority of API endpoints are only exposed for Artifactory Pro customers!** As such, many of the resources and actions exposed by this gem also require Artifactory Pro.

Expand Down Expand Up @@ -283,4 +285,3 @@ limitations under the License.

[appveyor]: https://ci.appveyor.com/project/chef/artifactory-client
[gem]: https://rubygems.org/gems/artifactory
[travis]: https://travis-ci.org/chef/artifactory-client
28 changes: 17 additions & 11 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,27 @@ RSpec::Core::RakeTask.new(:unit) do |t|
t.rspec_opts = "--tag ~integration"
end

require "chefstyle"
require "rubocop/rake_task"
desc "Run ChefStyle"
RuboCop::RakeTask.new(:chefstyle) do |task|
task.options << "--display-cop-names"
begin
require "chefstyle"
require "rubocop/rake_task"
desc "Run Chefstyle tests"
RuboCop::RakeTask.new(:style) do |task|
task.options += ["--display-cop-names", "--no-color"]
end
rescue LoadError
puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
end

begin
require "yard"
YARD::Rake::YardocTask.new(:docs)
rescue LoadError
puts "yard is not available. bundle install first to make sure all dependencies are installed."
end

desc "Generate coverage report"
RSpec::Core::RakeTask.new(:coverage) do |t|
ENV["COVERAGE"] = "true"
end

namespace :travis do
desc "Run tests on Travis"
task ci: %w{chefstyle unit integration}
end

task default: %w{travis:ci}
task default: %w{style unit integration}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.4
30 changes: 0 additions & 30 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion lib/artifactory/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
#

module Artifactory
VERSION = "3.0.1".freeze
VERSION = "3.0.4".freeze
end

0 comments on commit c662c4e

Please sign in to comment.