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

Jump to bottom

Upgrade CI to include Ruby 3.0.0 and Bundler 2.2.3 #203

Merged
merged 2 commits into from
Dec 28, 2020
Merged

Upgrade CI to include Ruby 3.0.0 and Bundler 2.2.3 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a7ad1
Upgrade CI to include Ruby 3.0.0 and Bundler 2.2.3
mattbrictson Dec 26, 2020
90c5569
Explicitly require the latest docker version
mattbrictson Dec 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
4 changes: 2 additions & 2 deletions .circleci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM cimg/ruby:2.7.2-node
FROM cimg/ruby:3.0.0-node
ARG DOCKER_MACHINE_NAME
ARG DOCKER_TLS_VERIFY
ARG DOCKER_HOST
WORKDIR /tomo
USER root
RUN gem install bundler -v 2.1.4
RUN gem install bundler -v 2.2.3
COPY . .
RUN bundle install --jobs=4 --retry=3
RUN chown -R circleci:circleci .
Expand Down
15 changes: 8 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ executors:
parameters:
version:
description: "Ruby version number"
default: "2.7.2"
default: "3.0.0"
type: string
docker:
- image: cimg/ruby:<< parameters.version >>
Expand All @@ -18,7 +18,7 @@ commands:
parameters:
version:
description: "Ruby version number"
default: "2.7.2"
default: "3.0.0"
type: string
steps:
- restore_cache:
Expand All @@ -27,7 +27,7 @@ commands:
- run:
name: Install Ruby Dependencies
command: |
gem install bundler -v 2.1.4 --conservative --no-document
gem install bundler -v 2.2.3 --conservative --no-document
bundle config --local path vendor/bundle
bundle check || (bundle install --jobs=4 --retry=3 && bundle clean)
- save_cache:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
parameters:
version:
description: "Ruby version number"
default: "2.7.2"
default: "3.0.0"
type: string
executor:
name: ruby
Expand All @@ -103,7 +103,8 @@ jobs:
executor: ruby
steps:
- checkout
- setup_remote_docker
- setup_remote_docker:
version: 19.03.13
- docker_build
- run:
name: bundle exec rake test:e2e (within docker container)
Expand All @@ -128,7 +129,7 @@ workflows:
- test_unit:
matrix:
parameters:
version: ["2.5.8", "2.6.6", "2.7.2"]
version: ["2.5.8", "2.6.6", "2.7.2", "3.0.0"]
- test_e2e
cron-workflow:
jobs:
Expand All @@ -137,7 +138,7 @@ workflows:
- test_unit:
matrix:
parameters:
version: ["2.5.8", "2.6.6", "2.7.2"]
version: ["2.5.8", "2.6.6", "2.7.2", "3.0.0"]
- test_e2e
triggers:
- schedule:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ branches:
- main
rvm:
- ruby-head
before_install: gem install bundler -v 2.1.4
before_install: gem install bundler -v 2.2.3
script: bundle exec rake test:unit