Skip to content

Commit 115a119

Browse files
authored
Update CI (#92)
* Update CI * Fixes * Can't cache bundler * Fix?
1 parent c1c1b74 commit 115a119

File tree

10 files changed

+43
-8
lines changed

10 files changed

+43
-8
lines changed

.github/workflows/ci.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches: [master]
47

58
jobs:
69
build:
710
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
811
runs-on: ubuntu-latest
912
strategy:
13+
fail-fast: false
1014
matrix:
11-
gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_7_1.gemfile, rails_7_2.gemfile, rails_main.gemfile]
12-
ruby_version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
15+
gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_7_1.gemfile, rails_7_2.gemfile, rails_8_0.gemfile, rails_main.gemfile]
16+
ruby_version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
1317
exclude:
1418
- gemfile: rails_main.gemfile
1519
ruby_version: '2.3'
@@ -25,6 +29,20 @@ jobs:
2529
ruby_version: '3.0'
2630
- gemfile: rails_main.gemfile
2731
ruby_version: '3.1'
32+
- gemfile: rails_8_0.gemfile
33+
ruby_version: '2.3'
34+
- gemfile: rails_8_0.gemfile
35+
ruby_version: '2.4'
36+
- gemfile: rails_8_0.gemfile
37+
ruby_version: '2.5'
38+
- gemfile: rails_8_0.gemfile
39+
ruby_version: '2.6'
40+
- gemfile: rails_8_0.gemfile
41+
ruby_version: '2.7'
42+
- gemfile: rails_8_0.gemfile
43+
ruby_version: '3.0'
44+
- gemfile: rails_8_0.gemfile
45+
ruby_version: '3.1'
2846
- gemfile: rails_7_2.gemfile
2947
ruby_version: '2.3'
3048
- gemfile: rails_7_2.gemfile
@@ -53,6 +71,8 @@ jobs:
5371
ruby_version: '2.5'
5472
- gemfile: rails_7_0.gemfile
5573
ruby_version: '2.6'
74+
- gemfile: rails_7_0.gemfile
75+
ruby_version: '3.4'
5676
- gemfile: rails_6_1.gemfile
5777
ruby_version: '2.3'
5878
- gemfile: rails_6_1.gemfile
@@ -63,6 +83,8 @@ jobs:
6383
ruby_version: '3.2'
6484
- gemfile: rails_6_1.gemfile
6585
ruby_version: '3.3'
86+
- gemfile: rails_6_1.gemfile
87+
ruby_version: '3.4'
6688
- gemfile: rails_6_0.gemfile
6789
ruby_version: '2.3'
6890
- gemfile: rails_6_0.gemfile
@@ -75,6 +97,8 @@ jobs:
7597
ruby_version: '3.2'
7698
- gemfile: rails_6_0.gemfile
7799
ruby_version: '3.3'
100+
- gemfile: rails_6_0.gemfile
101+
ruby_version: '3.4'
78102
- gemfile: rails_5_2.gemfile
79103
ruby_version: '3.0'
80104
- gemfile: rails_5_2.gemfile
@@ -83,6 +107,8 @@ jobs:
83107
ruby_version: '3.2'
84108
- gemfile: rails_5_2.gemfile
85109
ruby_version: '3.3'
110+
- gemfile: rails_5_2.gemfile
111+
ruby_version: '3.4'
86112
env:
87113
BUNDLE_GEMFILE: spec/gemfiles/${{ matrix.gemfile }}
88114
steps:
@@ -91,7 +117,6 @@ jobs:
91117
uses: ruby/setup-ruby@v1
92118
with:
93119
ruby-version: ${{ matrix.ruby_version }}
94-
bundler-cache: true
95120
- name: Before build
96121
run: |
97122
sudo apt-get install libsqlite3-dev
@@ -102,6 +127,8 @@ jobs:
102127
CC_TEST_REPORTER_ID: aff2c7b9e07e54d5fc9e5588d2e2a8bab4f69950d35000edc2b6250bbaba477d
103128
- name: Run test
104129
run: |
130+
bundle update
131+
bundle install --gemfile spec/gemfiles/${{ matrix.gemfile }} --jobs 4 --retry 3
105132
bundle exec rake code_analysis
106133
bundle exec rspec
107134
- name: Report to CodeClimate

spec/gemfiles/rails_5_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
33
gemspec path: '../..'
44

55
gem 'rails', '~> 5.2.0'
6-
gem 'sqlite3', '~> 1.4.4'
6+
gem 'sqlite3', '~> 1.4.2'

spec/gemfiles/rails_6_0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ source 'https://rubygems.org'
33
gemspec path: '../..'
44

55
gem 'rails', '~> 6.0.0'
6+
gem 'sqlite3', '~> 1.4.2'

spec/gemfiles/rails_6_1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ source 'https://rubygems.org'
33
gemspec path: '../..'
44

55
gem 'rails', '~> 6.1.0'
6+
gem 'sqlite3', '~> 1.4.2'

spec/gemfiles/rails_7_0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ source 'https://rubygems.org'
33
gemspec path: '../..'
44

55
gem 'rails', '~> 7.0.0'
6+
gem 'sqlite3', '~> 1.4.2'

spec/gemfiles/rails_7_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
22

33
gemspec path: '../..'
44

5-
gem 'rails', '~> 7.2.0.beta2'
5+
gem 'rails', '~> 7.2.0'

spec/gemfiles/rails_8_0.gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '../..'
4+
5+
gem 'rails', '~> 8.0.0'

spec/gemfiles/rails_main.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ source 'https://rubygems.org'
33
gemspec path: '../..'
44

55
gem 'rails', git: 'https://github.com/rails/rails', branch: 'main'
6-
gem 'sqlite3', '~> 2.1.0'

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

33
require 'bundler/setup'
4+
require 'logger'
45
require 'simplecov'
56
require 'uri' unless defined? URI::Generic
67
require 'active_record'

yaaf.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
3030
spec.add_development_dependency 'rspec', '~> 3.9.0'
3131
spec.add_development_dependency 'rubocop', '~> 0.80.0'
3232
spec.add_development_dependency 'simplecov', '~> 0.17.1'
33-
spec.add_development_dependency 'sqlite3', '~> 1.5.0'
33+
spec.add_development_dependency 'sqlite3'
3434
end

0 commit comments

Comments
 (0)