Skip to content

Commit e4e88a1

Browse files
committed
👷 GitLab CI DRY yaml config
1 parent ca24c14 commit e4e88a1

File tree

1 file changed

+15
-22
lines changed

1 file changed

+15
-22
lines changed

.gitlab-ci.yml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ variables:
99
K_SOUP_COV_DO: true
1010
K_SOUP_COV_HARD: true
1111
K_SOUP_COV_MIN_BRANCH: 98
12-
K_SOUP_COV_MIN_LINE: 100
12+
K_SOUP_COV_MIN_LINE: 98
1313
K_SOUP_COV_VERBOSE: true
1414
K_SOUP_COV_FORMATTERS: "html,xml,rcov,lcov,json,tty"
1515
K_SOUP_COV_MULTI_FORMATTERS: true
@@ -37,28 +37,12 @@ workflow:
3737
paths:
3838
- vendor/ruby
3939

40-
.test_template-eol: &test_definition-eol
41-
image: ruby:${RUBY_VERSION}
42-
stage: test
43-
script:
44-
# Because we support EOL Ruby still...
45-
- gem install rubygems-update -v 3.5.23
46-
# Actually updates both RubyGems and Bundler!
47-
- update_rubygems
48-
- bundle config --local path vendor
49-
- bundle install
50-
- bundle exec rake test
51-
cache:
52-
key: ${CI_JOB_IMAGE}
53-
paths:
54-
- vendor/ruby
55-
5640
.test_template-legacy: &test_definition-legacy
5741
image: ruby:${RUBY_VERSION}
5842
stage: test
5943
script:
6044
# Because we support EOL Ruby still...
61-
- gem install rubygems-update -v 3.4.22
45+
- gem install rubygems-update -v ${RUBYGEMS_VERSION}
6246
# Actually updates both RubyGems and Bundler!
6347
- update_rubygems
6448
- bundle config --local path vendor
@@ -73,16 +57,25 @@ ruby-current:
7357
<<: *test_definition-current
7458
parallel:
7559
matrix:
76-
- RUBY_VERSION: ["3.1", "3.2", "3.3", "3.4"]
60+
- RUBY_VERSION: ["3.2", "3.3", "3.4"]
7761

78-
ruby-eol:
79-
<<: *test_definition-eol
62+
ruby-eol3:
63+
<<: *test_definition-legacy
64+
parallel:
65+
matrix:
66+
- RUBY_VERSION: ["3.1"]
67+
- RUBYGEMS_VERSION: ["3.6.9"]
68+
69+
ruby-eol2:
70+
<<: *test_definition-legacy
8071
parallel:
8172
matrix:
8273
- RUBY_VERSION: ["3.0"]
74+
- RUBYGEMS_VERSION: ["3.5.23"]
8375

84-
ruby-legacy:
76+
ruby-eol1:
8577
<<: *test_definition-legacy
8678
parallel:
8779
matrix:
8880
- RUBY_VERSION: ["2.7"]
81+
- RUBYGEMS_VERSION: ["3.4.22"]

0 commit comments

Comments
 (0)