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.

Sign up for GitHub

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

Update bundler to 2.0 #250

Merged
merged 3 commits into from
Jan 28, 2020
+7 −15
Merged

Update bundler to 2.0 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed9fc77
refactor(gemspec): sort dependencies alphabetically
rjherrera Jan 27, 2020
643192b
feat(bundler): update bundler to 2.0
rjherrera Jan 28, 2020
fe3ad75
fix(ci): avoid restoring cache due to unexpected errors
rjherrera Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,9 @@ jobs:
- checkout
- setup_remote_docker

- run: sudo chown -R circleci /usr/local/bundle
- restore_cache:
keys:
- potassium-bundle-{{ .Branch }}-
- potassium-bundle-master-
- potassium-bundle-
- run: gem install bundler:2.0.2
- run: bundle install --jobs=4 --retry=3
- run: gem install hound-cli
- save_cache:
key: potassium-bundle-{{ .Branch }}-{{ epoch }}
paths:
- /usr/local/bundle
- run:
command: bundle exec rspec --color --require spec_helper --format=doc --format progress $(circleci tests glob spec/**/*_spec.rb | circleci tests split)
environment:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

Features:
- Update ActiveAdmin to 2.6 [#246](https://github.com/platanus/potassium/pull/246)
- Update bundler to 2.0 [#250](https://github.com/platanus/potassium/pull/250)

Fix:
- Correctly use cache for bundle dependencies in CircleCi build [#244](https://github.com/platanus/potassium/pull/244)
Expand Down
10 changes: 5 additions & 5 deletions potassium.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "bundler", "~> 2.0"
Copy link
Member

Choose a reason for hiding this comment

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

~> 2.1 ?

Copy link
Member Author

@rjherrera rjherrera Jan 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

for some unknown mystical reason CI wont work with bundler >2.0.2 so I think that for consistency gemspec and ci build should both use roughly the same version

spec.add_development_dependency "pry", "~> 0.10.3"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec", "~> 3.4.0"
spec.add_development_dependency "pry", "~> 0.10.3"
spec.add_development_dependency "rubocop", Potassium::RUBOCOP_VERSION
spec.add_development_dependency "rubocop-rspec"
spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
spec.add_runtime_dependency "gems", "~> 0.8"
spec.add_runtime_dependency "gli", "~> 2.12.2"
spec.add_runtime_dependency "inquirer", "~> 0.2"
spec.add_runtime_dependency "gems", "~> 0.8"
spec.add_runtime_dependency "semantic", "~> 1.4"
spec.add_runtime_dependency "levenshtein", "~> 0.2"
spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
spec.add_runtime_dependency "semantic", "~> 1.4"
end