Skip to content

Commit 178f675

Browse files
authored
Merge pull request #182 from w-masahiro-ct/improve-test-ci
Improve test CI
2 parents 09c5baa + 606c957 commit 178f675

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

.github/workflows/test.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,24 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', jruby ]
12-
gemfile: [ gemfiles/carrierwave-3.gemfile ]
11+
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
12+
gemfile: [gemfiles/carrierwave-3.gemfile]
13+
experimental: [false]
1314
include:
14-
- ruby: '3.2'
15+
- ruby: '3.4'
1516
gemfile: gemfiles/carrierwave-2.gemfile
16-
- ruby: '3.2'
17+
experimental: false
18+
- ruby: '3.4'
1719
gemfile: gemfiles/carrierwave-master.gemfile
18-
runs-on: ubuntu-20.04
20+
experimental: false
21+
- ruby: ruby-head
22+
gemfile: gemfiles/carrierwave-3.gemfile
23+
experimental: true
24+
- ruby: jruby-head
25+
gemfile: gemfiles/carrierwave-2.gemfile
26+
experimental: false
27+
runs-on: ubuntu-24.04
28+
continue-on-error: ${{ matrix.experimental }}
1929
env:
2030
S3_BUCKET_NAME: test-bucket
2131
S3_ACCESS_KEY: DummyAccessKey
@@ -33,7 +43,7 @@ jobs:
3343
-v /tmp/data:/data \
3444
-v /tmp/config:/root/.minio \
3545
minio/minio server /data
36-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v4
3747
- name: Set up Ruby
3848
uses: ruby/setup-ruby@v1
3949
with:
@@ -44,13 +54,13 @@ jobs:
4454

4555
rubocop:
4656
name: RuboCop
47-
runs-on: ubuntu-latest
57+
runs-on: ubuntu-24.04
4858
steps:
49-
- uses: actions/checkout@v2
59+
- uses: actions/checkout@v4
5060
- name: Set up Ruby
5161
uses: ruby/setup-ruby@v1
5262
with:
53-
ruby-version: "3.2"
63+
ruby-version: '3.4'
5464
bundler-cache: true
5565
- name: Run check
5666
run: bundle exec rake rubocop

gemfiles/carrierwave-2.gemfile

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

55
gem 'carrierwave', '~> 2.0'
6+
gem 'concurrent-ruby', '1.3.4' # Tests fail with 1.3.5 on Ruby 2.5 and 2.6
67

78
gemspec path: '../'

gemfiles/carrierwave-3.gemfile

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

55
gem 'carrierwave', '~> 3.0'
6+
gem 'concurrent-ruby', '1.3.4' # Tests fail with 1.3.5 on Ruby 2.5 and 2.6
67

78
gemspec path: '../'

gemfiles/carrierwave-master.gemfile

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

55
gem 'carrierwave', github: 'carrierwaveuploader/carrierwave'
6+
gem 'concurrent-ruby', '1.3.4' # Tests fail with 1.3.5 on Ruby 2.5 and 2.6
67

78
gemspec path: '../'

0 commit comments

Comments
 (0)