Skip to content

Commit

Permalink
Merge pull request #3305 from amatsuda/5-x-ci
Browse files Browse the repository at this point in the history
Make 5-x-stable CI green again
  • Loading branch information
amatsuda committed Jan 20, 2023
2 parents 4c5d13a + 1ec1ab3 commit 061f33b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 60 deletions.
25 changes: 10 additions & 15 deletions .github/workflows/ruby.yml
Expand Up @@ -7,9 +7,6 @@ jobs:
name: Ruby specs
runs-on: ${{ matrix.os }}
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' || matrix.experimental }}
env:
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
strategy:
fail-fast: false
matrix:
Expand All @@ -34,25 +31,23 @@ jobs:
gemfile: gemfiles/Gemfile-rails-edge
experimental: true

env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: /home/runner/bundle
key: bundle-use-ruby-${{ matrix.ruby }}-${{ matrix.gemfile }}-gems-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}
restore-keys: |
bundle-use-ruby-${{ matrix.ruby }}-${{ matrix.gemfile }}-gems-

- uses: ruby/setup-ruby@v1
if: matrix.ruby >= '2.6'
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
rubygems: latest

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

- name: Ruby specs
run: bundle exec rake test
43 changes: 0 additions & 43 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -9,7 +9,7 @@ yarn
```

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

### 1. Check the code for JavaScript style violations
Expand Down
6 changes: 5 additions & 1 deletion README.md
@@ -1,6 +1,10 @@
# Webpacker

[![Build Status](https://travis-ci.org/rails/webpacker.svg?branch=master)](https://travis-ci.org/rails/webpacker)
[![Ruby specs](https://github.com/rails/webpacker/workflows/Ruby%20specs/badge.svg)](https://github.com/rails/webpacker/actions)
[![Jest specs](https://github.com/rails/webpacker/workflows/Jest%20specs/badge.svg)](https://github.com/rails/webpacker/actions)
[![Rubocop](https://github.com/rails/webpacker/workflows/Rubocop/badge.svg)](https://github.com/rails/webpacker/actions)
[![JS lint](https://github.com/rails/webpacker/workflows/JS%20lint/badge.svg)](https://github.com/rails/webpacker/actions)

[![node.js](https://img.shields.io/badge/node-%3E%3D%2010.17.0-brightgreen.svg)](https://www.npmjs.com/package/@rails/webpacker)
[![Gem](https://img.shields.io/gem/v/webpacker.svg)](https://rubygems.org/gems/webpacker)

Expand Down

0 comments on commit 061f33b

Please sign in to comment.