Skip to content

Commit 88a5498

Browse files
johnnyshieldsjohnnyshields
authored
Merge branch 'master' into MONGOID-5336 
2 parents f28fd74 + f2bdc18 commit 88a5498

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2381
-321
lines changed

‎.evergreen/config.yml‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ axes:
353353
display_name: "MongoDB 3.6"
354354
variables:
355355
VERSION: "3.6"
356-
356+
357357
- id: "topology"
358358
display_name: Topology
359359
values:
@@ -370,7 +370,7 @@ axes:
370370
variables:
371371
TOPOLOGY: "sharded-cluster"
372372
SINGLE_MONGOS: true
373-
373+
374374
- id: "auth"
375375
display_name: Authentication
376376
values:
@@ -382,7 +382,7 @@ axes:
382382
display_name: NoAuth
383383
variables:
384384
AUTH: "noauth"
385-
385+
386386
- id: "ssl"
387387
display_name: SSL
388388
values:
@@ -394,14 +394,10 @@ axes:
394394
display_name: NoSSL
395395
variables:
396396
SSL: "nossl"
397-
397+
398398
- id: "ruby"
399399
display_name: Ruby Version
400400
values:
401-
- id: "ruby-2.5"
402-
display_name: ruby-2.5
403-
variables:
404-
RVM_RUBY: "ruby-2.5"
405401
- id: "ruby-2.6"
406402
display_name: ruby-2.6
407403
variables:
@@ -422,19 +418,15 @@ axes:
422418
display_name: ruby-head
423419
variables:
424420
RVM_RUBY: "ruby-head"
425-
421+
426422
- id: "jruby"
427423
display_name: JRuby Version
428424
values:
429-
- id: "jruby-9.2"
430-
display_name: jruby-9.2
431-
variables:
432-
RVM_RUBY: "jruby-9.2"
433425
- id: "jruby-9.3"
434426
display_name: jruby-9.3
435427
variables:
436428
RVM_RUBY: "jruby-9.3"
437-
429+
438430
- id: "os"
439431
display_name: OS
440432
values:
@@ -463,7 +455,7 @@ axes:
463455
run_on: rhel80-small
464456
variables:
465457
DOCKER_DISTRO: rhel80
466-
458+
467459
- id: "driver"
468460
display_name: Driver Version
469461
values:
@@ -511,18 +503,14 @@ axes:
511503
display_name: "BSON-master"
512504
variables:
513505
DRIVER: "bson-master"
514-
506+
515507
- id: "rails"
516508
display_name: Rails Version
517509
values:
518510
- id: master
519511
display_name: "Rails master"
520512
variables:
521513
RAILS: "master"
522-
- id: "5.1"
523-
display_name: "Rails 5.1"
524-
variables:
525-
RAILS: "5.1"
526514
- id: "5.2"
527515
display_name: "Rails 5.2"
528516
variables:
@@ -539,7 +527,7 @@ axes:
539527
display_name: "Rails 7.0"
540528
variables:
541529
RAILS: "7.0"
542-
530+
543531
- id: "i18n"
544532
display_name: I18n version
545533
values:
@@ -549,15 +537,15 @@ axes:
549537
I18N: "1.0"
550538
- id: current
551539
display_name: "i18n-current"
552-
540+
553541
- id: "test-i18n-fallbacks"
554542
display_name: Test i18n fallbacks
555543
values:
556544
- id: yes
557545
display_name: "i18n-fallbacks"
558546
variables:
559547
TEST_I18N_FALLBACKS: yes
560-
548+
561549
- id: app-tests
562550
display_name: Mongoid application tests
563551
values:
@@ -601,7 +589,7 @@ buildvariants:
601589

602590
- matrix_name: "jruby"
603591
matrix_spec:
604-
jruby: ["jruby-9.2", "jruby-9.3"]
592+
jruby: ["jruby-9.3"]
605593
driver: ["current"]
606594
topology: ['replica-set', 'sharded-cluster']
607595
mongodb-version: '5.0'
@@ -632,17 +620,6 @@ buildvariants:
632620
tasks:
633621
- name: "test"
634622

635-
- matrix_name: "ruby-2.5"
636-
matrix_spec:
637-
ruby: ["ruby-2.5"]
638-
driver: ["current"]
639-
topology: ['replica-set']
640-
mongodb-version: ['3.6']
641-
os: ubuntu-16.04
642-
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
643-
tasks:
644-
- name: "test"
645-
646623
- matrix_name: "driver-upcoming"
647624
matrix_spec:
648625
driver: [master, stable]
@@ -657,7 +634,7 @@ buildvariants:
657634
- matrix_name: "driver-oldstable"
658635
matrix_spec:
659636
driver: [oldstable, min]
660-
ruby: ["ruby-2.5"]
637+
ruby: ["ruby-2.6"]
661638
mongodb-version: "4.0"
662639
topology: ['replica-set', 'sharded-cluster']
663640
os: ubuntu-18.04
@@ -668,7 +645,7 @@ buildvariants:
668645
- matrix_name: "driver-min"
669646
matrix_spec:
670647
driver: [min]
671-
ruby: ["ruby-2.5"]
648+
ruby: ["ruby-2.6"]
672649
mongodb-version: "3.6"
673650
topology: "standalone"
674651
os: ubuntu-16.04
@@ -729,15 +706,15 @@ buildvariants:
729706
driver: ["current"]
730707
mongodb-version: "4.0"
731708
topology: "standalone"
732-
rails: ['5.1', '5.2']
709+
rails: ['5.2']
733710
os: ubuntu-18.04
734711
display_name: "${rails}, ${driver}, ${mongodb-version}"
735712
tasks:
736713
- name: "test"
737714

738715
- matrix_name: "i18n-1.0"
739716
matrix_spec:
740-
ruby: "ruby-2.5"
717+
ruby: "ruby-2.6"
741718
driver: ["current"]
742719
mongodb-version: "4.4"
743720
topology: "standalone"
@@ -780,15 +757,15 @@ buildvariants:
780757
mongodb-version: '5.0'
781758
topology: standalone
782759
app-tests: yes
783-
rails: ['5.1', '5.2']
760+
rails: ['5.2']
784761
os: ubuntu-18.04
785762
display_name: "app tests ${driver}, ${ruby}, ${rails}"
786763
tasks:
787764
- name: "test"
788765

789766
- matrix_name: app-tests-jruby
790767
matrix_spec:
791-
jruby: ["jruby-9.2", "jruby-9.3"]
768+
jruby: ["jruby-9.3"]
792769
driver: ["current"]
793770
mongodb-version: '5.0'
794771
topology: standalone

‎.evergreen/config/axes.yml.erb‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ axes:
3030
display_name: "MongoDB 3.6"
3131
variables:
3232
VERSION: "3.6"
33-
33+
3434
- id: "topology"
3535
display_name: Topology
3636
values:
@@ -47,7 +47,7 @@ axes:
4747
variables:
4848
TOPOLOGY: "sharded-cluster"
4949
SINGLE_MONGOS: true
50-
50+
5151
- id: "auth"
5252
display_name: Authentication
5353
values:
@@ -59,7 +59,7 @@ axes:
5959
display_name: NoAuth
6060
variables:
6161
AUTH: "noauth"
62-
62+
6363
- id: "ssl"
6464
display_name: SSL
6565
values:
@@ -71,14 +71,10 @@ axes:
7171
display_name: NoSSL
7272
variables:
7373
SSL: "nossl"
74-
74+
7575
- id: "ruby"
7676
display_name: Ruby Version
7777
values:
78-
- id: "ruby-2.5"
79-
display_name: ruby-2.5
80-
variables:
81-
RVM_RUBY: "ruby-2.5"
8278
- id: "ruby-2.6"
8379
display_name: ruby-2.6
8480
variables:
@@ -99,19 +95,15 @@ axes:
9995
display_name: ruby-head
10096
variables:
10197
RVM_RUBY: "ruby-head"
102-
98+
10399
- id: "jruby"
104100
display_name: JRuby Version
105101
values:
106-
- id: "jruby-9.2"
107-
display_name: jruby-9.2
108-
variables:
109-
RVM_RUBY: "jruby-9.2"
110102
- id: "jruby-9.3"
111103
display_name: jruby-9.3
112104
variables:
113105
RVM_RUBY: "jruby-9.3"
114-
106+
115107
- id: "os"
116108
display_name: OS
117109
values:
@@ -140,7 +132,7 @@ axes:
140132
run_on: rhel80-small
141133
variables:
142134
DOCKER_DISTRO: rhel80
143-
135+
144136
- id: "driver"
145137
display_name: Driver Version
146138
values:
@@ -188,18 +180,14 @@ axes:
188180
display_name: "BSON-master"
189181
variables:
190182
DRIVER: "bson-master"
191-
183+
192184
- id: "rails"
193185
display_name: Rails Version
194186
values:
195187
- id: master
196188
display_name: "Rails master"
197189
variables:
198190
RAILS: "master"
199-
- id: "5.1"
200-
display_name: "Rails 5.1"
201-
variables:
202-
RAILS: "5.1"
203191
- id: "5.2"
204192
display_name: "Rails 5.2"
205193
variables:
@@ -216,7 +204,7 @@ axes:
216204
display_name: "Rails 7.0"
217205
variables:
218206
RAILS: "7.0"
219-
207+
220208
- id: "i18n"
221209
display_name: I18n version
222210
values:
@@ -226,15 +214,15 @@ axes:
226214
I18N: "1.0"
227215
- id: current
228216
display_name: "i18n-current"
229-
217+
230218
- id: "test-i18n-fallbacks"
231219
display_name: Test i18n fallbacks
232220
values:
233221
- id: yes
234222
display_name: "i18n-fallbacks"
235223
variables:
236224
TEST_I18N_FALLBACKS: yes
237-
225+
238226
- id: app-tests
239227
display_name: Mongoid application tests
240228
values:

0 commit comments

Comments
 (0)