Skip to content

Commit b87e724

Browse files
Backport toolchain to 8.0 (#6062)
1 parent 2a6ae43 commit b87e724

File tree

12 files changed

+546
-550
lines changed

12 files changed

+546
-550
lines changed

.evergreen/config.yml

Lines changed: 239 additions & 250 deletions
Large diffs are not rendered by default.

.evergreen/config/axes.yml.erb

Lines changed: 42 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,59 @@ axes:
55
- id: "latest"
66
display_name: "MongoDB Latest"
77
variables:
8-
VERSION: "latest"
8+
MONGODB_VERSION: "latest"
9+
- id: "8.0"
10+
display_name: "MongoDB 8.0"
11+
variables:
12+
MONGODB_VERSION: "8.0"
913
- id: "7.0"
1014
display_name: "MongoDB 7.0"
1115
variables:
12-
VERSION: "7.0"
16+
MONGODB_VERSION: "7.0"
1317
- id: "6.0"
1418
display_name: "MongoDB 6.0"
1519
variables:
16-
VERSION: "6.0"
20+
MONGODB_VERSION: "6.0"
1721
- id: "5.3"
1822
display_name: "MongoDB 5.3"
1923
variables:
20-
VERSION: "5.3"
24+
MONGODB_VERSION: "5.3"
2125
- id: "5.0"
2226
display_name: "MongoDB 5.0"
2327
variables:
24-
VERSION: "5.0"
28+
MONGODB_VERSION: "5.0"
2529
- id: "4.4"
2630
display_name: "MongoDB 4.4"
2731
variables:
28-
VERSION: "4.4"
32+
MONGODB_VERSION: "4.4"
2933
- id: "4.2"
3034
display_name: "MongoDB 4.2"
3135
variables:
32-
VERSION: "4.2"
36+
MONGODB_VERSION: "4.2"
3337
- id: "4.0"
3438
display_name: "MongoDB 4.0"
3539
variables:
36-
VERSION: "4.0"
40+
MONGODB_VERSION: "4.0"
3741
- id: "3.6"
3842
display_name: "MongoDB 3.6"
3943
variables:
40-
VERSION: "3.6"
44+
MONGODB_VERSION: "3.6"
4145

4246
- id: "topology"
4347
display_name: Topology
4448
values:
45-
- id: "standalone"
49+
- id: "server"
4650
display_name: Standalone
4751
variables:
48-
TOPOLOGY: "standalone"
49-
- id: "replica-set"
52+
TOPOLOGY: "server"
53+
- id: "replica_set"
5054
display_name: Replica Set
5155
variables:
52-
TOPOLOGY: "replica-set"
53-
- id: "sharded-cluster"
56+
TOPOLOGY: "replica_set"
57+
- id: "sharded_cluster"
5458
display_name: Sharded Cluster
5559
variables:
56-
TOPOLOGY: "sharded-cluster"
57-
SINGLE_MONGOS: true
60+
TOPOLOGY: "sharded_cluster"
5861

5962
- id: "auth"
6063
display_name: Authentication
@@ -71,7 +74,7 @@ axes:
7174
- id: "ssl"
7275
display_name: SSL
7376
values:
74-
- id: "ssl"
77+
- id: "yes"
7578
display_name: SSL
7679
variables:
7780
SSL: "ssl"
@@ -83,10 +86,6 @@ axes:
8386
- id: "ruby"
8487
display_name: Ruby Version
8588
values:
86-
- id: "ruby-2.6"
87-
display_name: ruby-2.6
88-
variables:
89-
RVM_RUBY: "ruby-2.6"
9089
- id: "ruby-2.7"
9190
display_name: ruby-2.7
9291
variables:
@@ -99,6 +98,14 @@ axes:
9998
display_name: ruby-3.1
10099
variables:
101100
RVM_RUBY: "ruby-3.1"
101+
- id: "ruby-3.2"
102+
display_name: ruby-3.2
103+
variables:
104+
RVM_RUBY: "ruby-3.2"
105+
- id: "ruby-3.3"
106+
display_name: ruby-3.3
107+
variables:
108+
RVM_RUBY: "ruby-3.3"
102109
- id: "ruby-head"
103110
display_name: ruby-head
104111
variables:
@@ -107,10 +114,10 @@ axes:
107114
- id: "jruby"
108115
display_name: JRuby Version
109116
values:
110-
- id: "jruby-9.3"
111-
display_name: jruby-9.3
117+
- id: "jruby-9.4"
118+
display_name: jruby-9.4
112119
variables:
113-
RVM_RUBY: "jruby-9.3"
120+
RVM_RUBY: "jruby-9.4"
114121

115122
- id: "os"
116123
display_name: OS
@@ -121,15 +128,6 @@ axes:
121128
- id: ubuntu-20.04
122129
display_name: "Ubuntu 20.04"
123130
run_on: ubuntu2004-small
124-
- id: ubuntu-18.04
125-
display_name: "Ubuntu 18.04"
126-
run_on: ubuntu1804-small
127-
- id: debian11
128-
display_name: "Debian 11"
129-
run_on: debian11-small
130-
- id: rhel80
131-
display_name: "RHEL 8.0"
132-
run_on: rhel80-small
133131

134132
- id: "driver"
135133
display_name: Driver Version
@@ -186,10 +184,6 @@ axes:
186184
display_name: "Rails master"
187185
variables:
188186
RAILS: "master"
189-
- id: "5.2"
190-
display_name: "Rails 5.2"
191-
variables:
192-
RAILS: "5.2"
193187
- id: "6.0"
194188
display_name: "Rails 6.0"
195189
variables:
@@ -206,16 +200,10 @@ axes:
206200
display_name: "Rails 7.1"
207201
variables:
208202
RAILS: "7.1"
209-
210-
- id: "i18n"
211-
display_name: I18n version
212-
values:
213-
- id: '1.0'
214-
display_name: "i18n-1.0"
203+
- id: "8.0"
204+
display_name: "Rails 8.0"
215205
variables:
216-
I18N: "1.0"
217-
- id: current
218-
display_name: "i18n-current"
206+
RAILS: "8.0"
219207

220208
- id: "test-i18n-fallbacks"
221209
display_name: Test i18n fallbacks
@@ -233,22 +221,14 @@ axes:
233221
variables:
234222
APP_TESTS: yes
235223

236-
- id: toolchain
237-
display_name: Toolchain Version
224+
- id: "fle"
225+
display_name: FLE
238226
values:
239-
- id: 2023-05-11
240-
display_name: 2023-05-11
241-
variables:
242-
TOOLCHAIN_OVERRIDE: e8c60866f54bed7e336a37df3a97d6ae1b971b7d
243-
- id: 2023-11-02
244-
display_name: 2023-11-02
245-
variables:
246-
TOOLCHAIN_OVERRIDE: ded7ea845b08cf96f11a747d9540ba3199580dea
247-
- id: 2024-08-07
248-
display_name: 2024-08-07
227+
- id: "helper"
228+
display_name: via LMC helper
249229
variables:
250-
TOOLCHAIN_OVERRIDE: c950fe1e85fd7d5e4ea69cc2afff456825583716
251-
- id: 2024-09-06
252-
display_name: 2024-09-06
230+
FLE: helper
231+
- id: "path"
232+
display_name: via LMC path
253233
variables:
254-
TOOLCHAIN_OVERRIDE: deefab59d8f539bdd4a0154505f1e7d39a0857d0
234+
FLE: path

0 commit comments

Comments
 (0)