Skip to content
This repository has been archived by the owner on Dec 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #63 from NijiDigital/feature/circleci-2-migration
Browse files Browse the repository at this point in the history
Migrate to CircleCI 2.0
Using workflows to test against both Ruby 2.0.0 & latest ruby
  • Loading branch information
AliSoftware authored Mar 23, 2018
2 parents 391e04d + 36575bb commit 03c9498
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 5 deletions.
38 changes: 38 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
default_steps: &default_steps
steps:
- checkout
- run:
name: Which ruby?
command: ruby -v
- run:
name: Which bundler?
command: bundle -v
- run:
name: Bundle Install
command: bundle check || bundle install
- run:
name: Launch tests
command: bundle exec rspec
- run:
name: Execute Rubocop
command: bundle exec rubocop
- run:
name: Check PR format
command: bundle exec rake pr:check

version: 2
jobs:
build_old_ruby:
docker:
- image: drecom/ubuntu-ruby:2.0.0-p648
<<: *default_steps
build_latest_ruby:
docker:
- image: circleci/ruby:latest
<<: *default_steps
workflows:
version: 2
build:
jobs:
- build_old_ruby
- build_latest_ruby
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## master

* Migrate CircleCi from 1.0 to 2.0.
[Steven Watremez](https://github.com/StevenWatremez)
[#63](https://github.com/NijiDigital/gyro/pull/63)
* Change system for alias and deprecated templates.
_Now there is a config.yml inside template directory to manage alias and deprecated._
[Steven Watremez](https://github.com/StevenWatremez)
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace :pr do
desc 'Check incoming PRs on CI'
task :check do
if ENV['CI_PULL_REQUEST'].empty?
if ENV['CIRCLE_PULL_REQUEST'].empty?
warn 'Not part of a Pull Request, so nothing to check in this task'
next
end
Expand Down
4 changes: 0 additions & 4 deletions circle.yml

This file was deleted.

0 comments on commit 03c9498

Please sign in to comment.