Skip to content

Commit 2af83d3

Browse files
johnnyshieldsjohnnyshields
authored
Merge branch 'master' into remvoe-string-reader-writer-etc
2 parents 727b3f3 + fed822a commit 2af83d3

File tree

73 files changed

+952
-837
lines changed

Some content is hidden

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

73 files changed

+952
-837
lines changed

‎.evergreen/config.yml

Lines changed: 31 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ functions:
8888
export RVM_RUBY="${RVM_RUBY}"
8989
export RAILS="${RAILS}"
9090
export DRIVER="${DRIVER}"
91-
export I18N="${I18N}"
9291
export TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}"
9392
export FLE="${FLE}"
9493
EOT
@@ -276,7 +275,6 @@ functions:
276275
RVM_RUBY="${RVM_RUBY}" \
277276
RAILS="${RAILS}" \
278277
DRIVER="${DRIVER}" \
279-
I18N="${I18N}" \
280278
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
281279
FLE="${FLE}" \
282280
.evergreen/run-tests-docker.sh
@@ -458,10 +456,6 @@ axes:
458456
- id: "ruby"
459457
display_name: Ruby Version
460458
values:
461-
- id: "ruby-2.6"
462-
display_name: ruby-2.6
463-
variables:
464-
RVM_RUBY: "ruby-2.6"
465459
- id: "ruby-2.7"
466460
display_name: ruby-2.7
467461
variables:
@@ -486,22 +480,22 @@ axes:
486480
- id: "jruby"
487481
display_name: JRuby Version
488482
values:
489-
- id: "jruby-9.3"
490-
display_name: jruby-9.3
483+
- id: "jruby-9.4"
484+
display_name: jruby-9.4
491485
variables:
492-
RVM_RUBY: "jruby-9.3"
486+
RVM_RUBY: "jruby-9.4"
493487

494488
- id: "os"
495489
display_name: OS
496490
values:
497491
- id: actual-ubuntu-22.04
498492
display_name: "Ubuntu 22.04"
499493
run_on: ubuntu2204-small
500-
- id: ubuntu-18.04
501-
display_name: "Ubuntu 18.04"
494+
- id: ubuntu-20.04
495+
display_name: "Ubuntu 20.04"
502496
run_on: ubuntu2004-small
503497
variables:
504-
DOCKER_DISTRO: ubuntu1804
498+
DOCKER_DISTRO: ubuntu2004
505499
- id: ubuntu-22.04
506500
display_name: "Ubuntu 22.04"
507501
run_on: ubuntu2004-small
@@ -573,10 +567,6 @@ axes:
573567
display_name: "Rails master"
574568
variables:
575569
RAILS: "master"
576-
- id: "5.2"
577-
display_name: "Rails 5.2"
578-
variables:
579-
RAILS: "5.2"
580570
- id: "6.0"
581571
display_name: "Rails 6.0"
582572
variables:
@@ -594,16 +584,6 @@ axes:
594584
variables:
595585
RAILS: "7.1"
596586

597-
- id: "i18n"
598-
display_name: I18n version
599-
values:
600-
- id: '1.0'
601-
display_name: "i18n-1.0"
602-
variables:
603-
I18N: "1.0"
604-
- id: current
605-
display_name: "i18n-current"
606-
607587
- id: "test-i18n-fallbacks"
608588
display_name: Test i18n fallbacks
609589
values:
@@ -678,7 +658,7 @@ buildvariants:
678658

679659
- matrix_name: "jruby"
680660
matrix_spec:
681-
jruby: ["jruby-9.3"]
661+
jruby: ["jruby-9.4"]
682662
driver: ["current"]
683663
topology: ['replica-set', 'sharded-cluster']
684664
mongodb-version: '5.0'
@@ -698,17 +678,6 @@ buildvariants:
698678
tasks:
699679
- name: "test"
700680

701-
- matrix_name: "ruby-2.6"
702-
matrix_spec:
703-
ruby: ["ruby-2.6"]
704-
driver: ["current"]
705-
topology: ['replica-set']
706-
mongodb-version: ['4.0']
707-
os: rhel80
708-
display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
709-
tasks:
710-
- name: "test"
711-
712681
- matrix_name: "driver-upcoming"
713682
matrix_spec:
714683
driver: [master, stable]
@@ -723,7 +692,7 @@ buildvariants:
723692
- matrix_name: "driver-oldstable"
724693
matrix_spec:
725694
driver: [oldstable, min]
726-
ruby: ["ruby-2.6"]
695+
ruby: ["ruby-2.7"]
727696
mongodb-version: "4.0"
728697
topology: ['replica-set', 'sharded-cluster']
729698
os: rhel80
@@ -734,7 +703,7 @@ buildvariants:
734703
- matrix_name: "driver-min"
735704
matrix_spec:
736705
driver: [min]
737-
ruby: ["ruby-2.6"]
706+
ruby: ["ruby-2.7"]
738707
mongodb-version: "3.6"
739708
topology: "standalone"
740709
os: rhel80
@@ -790,81 +759,57 @@ buildvariants:
790759
tasks:
791760
- name: "test"
792761

793-
- matrix_name: "rails-5"
794-
matrix_spec:
795-
ruby: ["ruby-2.7"]
796-
driver: ["current"]
797-
mongodb-version: "4.0"
798-
topology: "standalone"
799-
rails: ['5.2']
800-
os: rhel80
801-
display_name: "${rails}, ${driver}, ${mongodb-version}"
802-
tasks:
803-
- name: "test"
804-
805-
- matrix_name: "i18n-1.0"
806-
matrix_spec:
807-
ruby: "ruby-2.6"
808-
driver: ["current"]
809-
mongodb-version: "4.4"
810-
topology: "standalone"
811-
i18n: '1.0'
812-
os: rhel80
813-
display_name: "i18n-1.0 ${rails}, ${driver}, ${mongodb-version}"
814-
tasks:
815-
- name: "test"
816-
817762
- matrix_name: "i18n-fallbacks"
818763
matrix_spec:
819-
ruby: "ruby-2.6"
764+
ruby: "ruby-2.7"
820765
driver: ["current"]
821766
mongodb-version: "4.2"
822767
topology: "standalone"
823-
i18n: '*'
824768
test-i18n-fallbacks: yes
825769
os: rhel80
826-
display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}, ${i18n}"
770+
display_name: "i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
827771
tasks:
828772
- name: "test"
829773

830-
- matrix_name: app-tests-ruby-3
774+
- matrix_name: app-tests-rails-7
831775
matrix_spec:
832-
ruby: ["ruby-3.0", "ruby-3.1", "ruby-3.2"]
776+
ruby: ["ruby-3.1", "ruby-3.2"]
833777
driver: ["current"]
834778
mongodb-version: '6.0'
835779
topology: standalone
836780
app-tests: yes
837-
rails: ['6.0', '6.1', '7.0', '7.1']
838-
os: rhel80
781+
rails: ['6.1', '7.0', '7.1']
782+
os: ubuntu-20.04
839783
display_name: "app tests ${driver}, ${ruby}, ${rails}"
840784
tasks:
841785
- name: "test"
842786

843-
- matrix_name: app-tests-ruby-2.7
787+
- matrix_name: app-tests-rails-6-0
844788
matrix_spec:
845-
ruby: ruby-2.7
789+
ruby: ["ruby-2.7"]
846790
driver: ["current"]
847791
mongodb-version: '5.0'
848792
topology: standalone
849793
app-tests: yes
850-
rails: ['5.2']
794+
rails: ['6.0']
851795
os: rhel80
852796
display_name: "app tests ${driver}, ${ruby}, ${rails}"
853797
tasks:
854798
- name: "test"
855799

856-
- matrix_name: app-tests-jruby
857-
matrix_spec:
858-
jruby: ["jruby-9.3"]
859-
driver: ["current"]
860-
mongodb-version: '5.0'
861-
topology: standalone
862-
app-tests: yes
863-
rails: ['6.0']
864-
os: ubuntu-18.04
865-
display_name: "app tests ${driver}, ${jruby}"
866-
tasks:
867-
- name: "test"
800+
# https://github.com/rails/rails/issues/49737
801+
#- matrix_name: app-tests-jruby-9-4
802+
# matrix_spec:
803+
# jruby: ["jruby-9.4"]
804+
# driver: ["current"]
805+
# mongodb-version: '5.0'
806+
# topology: standalone
807+
# app-tests: yes
808+
# rails: ['7.1']
809+
# os: ubuntu-20.04
810+
# display_name: "app tests ${driver}, ${jruby}"
811+
# tasks:
812+
# - name: "test"
868813

869814
- matrix_name: "auto-encryption"
870815
matrix_spec:

‎.evergreen/config/axes.yml.erb

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ axes:
8383
- id: "ruby"
8484
display_name: Ruby Version
8585
values:
86-
- id: "ruby-2.6"
87-
display_name: ruby-2.6
88-
variables:
89-
RVM_RUBY: "ruby-2.6"
9086
- id: "ruby-2.7"
9187
display_name: ruby-2.7
9288
variables:
@@ -111,22 +107,22 @@ axes:
111107
- id: "jruby"
112108
display_name: JRuby Version
113109
values:
114-
- id: "jruby-9.3"
115-
display_name: jruby-9.3
110+
- id: "jruby-9.4"
111+
display_name: jruby-9.4
116112
variables:
117-
RVM_RUBY: "jruby-9.3"
113+
RVM_RUBY: "jruby-9.4"
118114

119115
- id: "os"
120116
display_name: OS
121117
values:
122118
- id: actual-ubuntu-22.04
123119
display_name: "Ubuntu 22.04"
124120
run_on: ubuntu2204-small
125-
- id: ubuntu-18.04
126-
display_name: "Ubuntu 18.04"
121+
- id: ubuntu-20.04
122+
display_name: "Ubuntu 20.04"
127123
run_on: ubuntu2004-small
128124
variables:
129-
DOCKER_DISTRO: ubuntu1804
125+
DOCKER_DISTRO: ubuntu2004
130126
- id: ubuntu-22.04
131127
display_name: "Ubuntu 22.04"
132128
run_on: ubuntu2004-small
@@ -198,10 +194,6 @@ axes:
198194
display_name: "Rails master"
199195
variables:
200196
RAILS: "master"
201-
- id: "5.2"
202-
display_name: "Rails 5.2"
203-
variables:
204-
RAILS: "5.2"
205197
- id: "6.0"
206198
display_name: "Rails 6.0"
207199
variables:
@@ -219,16 +211,6 @@ axes:
219211
variables:
220212
RAILS: "7.1"
221213

222-
- id: "i18n"
223-
display_name: I18n version
224-
values:
225-
- id: '1.0'
226-
display_name: "i18n-1.0"
227-
variables:
228-
I18N: "1.0"
229-
- id: current
230-
display_name: "i18n-current"
231-
232214
- id: "test-i18n-fallbacks"
233215
display_name: Test i18n fallbacks
234216
values:

‎.evergreen/config/commands.yml.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ functions:
6262
export RVM_RUBY="${RVM_RUBY}"
6363
export RAILS="${RAILS}"
6464
export DRIVER="${DRIVER}"
65-
export I18N="${I18N}"
6665
export TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}"
6766
export FLE="${FLE}"
6867
EOT
@@ -250,7 +249,6 @@ functions:
250249
RVM_RUBY="${RVM_RUBY}" \
251250
RAILS="${RAILS}" \
252251
DRIVER="${DRIVER}" \
253-
I18N="${I18N}" \
254252
TEST_I18N_FALLBACKS="${TEST_I18N_FALLBACKS}" \
255253
FLE="${FLE}" \
256254
.evergreen/run-tests-docker.sh

0 commit comments

Comments
 (0)