Skip to content

Commit 061f33b

Browse files
authored
Merge pull request #3305 from amatsuda/5-x-ci
Make 5-x-stable CI green again
2 parents 4c5d13a + 1ec1ab3 commit 061f33b

File tree

4 files changed

+16
-60
lines changed

4 files changed

+16
-60
lines changed

.github/workflows/ruby.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ jobs:
77
name: Ruby specs
88
runs-on: ${{ matrix.os }}
99
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' || matrix.experimental }}
10-
env:
11-
BUNDLE_JOBS: 4
12-
BUNDLE_RETRY: 3
1310
strategy:
1411
fail-fast: false
1512
matrix:
@@ -34,25 +31,23 @@ jobs:
3431
gemfile: gemfiles/Gemfile-rails-edge
3532
experimental: true
3633

34+
env:
35+
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
3736
steps:
3837
- uses: actions/checkout@v2
39-
- uses: actions/cache@v2
40-
with:
41-
path: /home/runner/bundle
42-
key: bundle-use-ruby-${{ matrix.ruby }}-${{ matrix.gemfile }}-gems-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
43-
restore-keys: |
44-
bundle-use-ruby-${{ matrix.ruby }}-${{ matrix.gemfile }}-gems-
4538

4639
- uses: ruby/setup-ruby@v1
40+
if: matrix.ruby >= '2.6'
4741
with:
4842
ruby-version: ${{ matrix.ruby }}
43+
bundler-cache: true
44+
rubygems: latest
4945

50-
- name: Bundle install
51-
run: |
52-
gem install bundler -v 2.1.4
53-
bundle config path /home/runner/bundle
54-
bundle config --global gemfile ${{ matrix.gemfile }}
55-
bundle install --jobs 4 --retry 3
46+
- uses: ruby/setup-ruby@v1
47+
if: matrix.ruby < '2.6' # Skip updating RubyGems on old rubies
48+
with:
49+
ruby-version: ${{ matrix.ruby }}
50+
bundler-cache: true
5651

5752
- name: Ruby specs
5853
run: bundle exec rake test

.travis.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ yarn
99
```
1010

1111
## Making sure your changes pass all tests
12-
There are a number of automated checks which run on Travis CI when a pull request is created.
12+
There are a number of automated checks which run on Github Actions when a pull request is created.
1313
You can run those checks on your own locally to make sure that your changes would not break the CI build.
1414

1515
### 1. Check the code for JavaScript style violations

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Webpacker
22

3-
[![Build Status](https://travis-ci.org/rails/webpacker.svg?branch=master)](https://travis-ci.org/rails/webpacker)
3+
[![Ruby specs](https://github.com/rails/webpacker/workflows/Ruby%20specs/badge.svg)](https://github.com/rails/webpacker/actions)
4+
[![Jest specs](https://github.com/rails/webpacker/workflows/Jest%20specs/badge.svg)](https://github.com/rails/webpacker/actions)
5+
[![Rubocop](https://github.com/rails/webpacker/workflows/Rubocop/badge.svg)](https://github.com/rails/webpacker/actions)
6+
[![JS lint](https://github.com/rails/webpacker/workflows/JS%20lint/badge.svg)](https://github.com/rails/webpacker/actions)
7+
48
[![node.js](https://img.shields.io/badge/node-%3E%3D%2010.17.0-brightgreen.svg)](https://www.npmjs.com/package/@rails/webpacker)
59
[![Gem](https://img.shields.io/gem/v/webpacker.svg)](https://rubygems.org/gems/webpacker)
610

0 commit comments

Comments
 (0)