Skip to content

Commit fc1a56a

Browse files
mcasimirmcasimir
committed
Merge branch 'main' into 1.32-releases
2 parents 9b729fa + 90a0d20 commit fc1a56a

File tree

387 files changed

+30886
-50704
lines changed

Some content is hidden

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

387 files changed

+30886
-50704
lines changed

‎.evergreen/buildvariants.in.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
buildvariants:
22
- name: macos_gui
3-
display_name: MacOS (Test w/ GUI Session)
3+
display_name: MacOS x64 (Test w/ GUI Session)
44
# TODO: Change this to our pool of machines when https://jira.mongodb.org/browse/BUILD-14120 is done
55
run_on: macos-1014-codesign
66
tasks:
77
- name: test-electron
8-
# TODO: These tests are not currently running due to keychain access
9-
# missing. We disable this step to not block codesign machine time
10-
# with bootstrap / teardown that does nothing. We should be able to
11-
# enable these tests after https://jira.mongodb.org/browse/BUILD-14458
12-
# - name: test-packaged-app-macos
8+
# TODO: Even though these tests are running, they run compass with a
9+
# keychain disabled and clipboard tests skipped
10+
#
11+
# https://jira.mongodb.org/browse/BUILD-14458
12+
# https://jira.mongodb.org/browse/BUILD-14780
13+
- name: test-packaged-app-macos
1314

1415
- name: macos
15-
display_name: MacOS (Test and Package)
16+
display_name: MacOS x64 (Test and Package)
1617
# TODO: Change this to our pool of machines when https://jira.mongodb.org/browse/BUILD-14120 is done
1718
run_on: macos-1014
1819
tasks:
@@ -22,6 +23,14 @@ buildvariants:
2223
- name: package-readonly
2324
- name: package-isolated
2425

26+
- name: macos_arm
27+
display_name: MacOS arm64 (Package)
28+
run_on: macos-1100-arm64
29+
tasks:
30+
- name: package
31+
- name: package-readonly
32+
- name: package-isolated
33+
2534
- name: coverage
2635
display_name: E2E Coverage
2736
run_on: ubuntu1604-large

‎.evergreen/buildvariants.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
buildvariants:
22
- name: macos_gui
3-
display_name: MacOS (Test w/ GUI Session)
3+
display_name: MacOS x64 (Test w/ GUI Session)
44
# TODO: Change this to our pool of machines when https://jira.mongodb.org/browse/BUILD-14120 is done
55
run_on: macos-1014-codesign
66
tasks:
77
- name: test-electron
8-
# TODO: These tests are not currently running due to keychain access
9-
# missing. We disable this step to not block codesign machine time
10-
# with bootstrap / teardown that does nothing. We should be able to
11-
# enable these tests after https://jira.mongodb.org/browse/BUILD-14458
12-
# - name: test-packaged-app-macos
8+
# TODO: Even though these tests are running, they run compass with a
9+
# keychain disabled and clipboard tests skipped
10+
#
11+
# https://jira.mongodb.org/browse/BUILD-14458
12+
# https://jira.mongodb.org/browse/BUILD-14780
13+
- name: test-packaged-app-macos
1314

1415
- name: macos
15-
display_name: MacOS (Test and Package)
16+
display_name: MacOS x64 (Test and Package)
1617
# TODO: Change this to our pool of machines when https://jira.mongodb.org/browse/BUILD-14120 is done
1718
run_on: macos-1014
1819
tasks:
@@ -22,6 +23,14 @@ buildvariants:
2223
- name: package-readonly
2324
- name: package-isolated
2425

26+
- name: macos_arm
27+
display_name: MacOS arm64 (Package)
28+
run_on: macos-1100-arm64
29+
tasks:
30+
- name: package
31+
- name: package-readonly
32+
- name: package-isolated
33+
2534
- name: coverage
2635
display_name: E2E Coverage
2736
run_on: ubuntu1604-large

‎.evergreen/functions.yml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ functions:
159159
eval $(.evergreen/print-compass-env.sh)
160160
161161
# Prepare workspaces in provided scope
162-
npx lerna run bootstrap --stream --scope "${scope}"
162+
npx lerna run bootstrap \
163+
--stream \
164+
--scope "${scope}" \
165+
--include-dependencies
163166
164167
check:
165168
command: shell.exec
@@ -306,11 +309,20 @@ functions:
306309
307310
# Unpack the app archive
308311
if [[ "${app_archive_name}" == *.zip ]]; then
309-
mkdir -p "$COMPASS_APP_PATH"
310-
unzip "packages/compass/dist/${app_archive_name}" -d "$COMPASS_APP_PATH"
312+
COMPASS_OUTDIR="$COMPASS_APP_PATH"
313+
if [[ "$IS_OSX" == "true" ]]; then
314+
# unzip on macos needs a different path to avoid nesting the .app
315+
# inside another .app dir
316+
COMPASS_OUTDIR=$(dirname "$COMPASS_APP_PATH")
317+
fi
318+
echo "Unpacking ${app_archive_name} to $COMPASS_OUTDIR ..."
319+
mkdir -p "$COMPASS_OUTDIR"
320+
unzip "packages/compass/dist/${app_archive_name}" -d "$COMPASS_OUTDIR"
311321
else
312-
mkdir -p "packages/compass/dist"
313-
tar -xzf "packages/compass/dist/${app_archive_name}" -C "packages/compass/dist"
322+
COMPASS_OUTDIR="packages/compass/dist"
323+
echo "Unpacking ${app_archive_name} to $COMPASS_OUTDIR ..."
324+
mkdir -p "$COMPASS_OUTDIR"
325+
tar -xzf "packages/compass/dist/${app_archive_name}" -C "$COMPASS_OUTDIR"
314326
fi
315327
316328
# Print folder content to confirm that it worked
@@ -333,7 +345,6 @@ functions:
333345
334346
echo "Running E2E tests while collecting coverage..."
335347
336-
337348
DEBUG=${debug} \
338349
MONGODB_VERSION="${mongodb_version|4.4.x}" \
339350
MONGODB_USE_ENTERPRISE="${mongodb_use_enterprise|}" \
@@ -358,6 +369,13 @@ functions:
358369
359370
echo "Running tests against packaged app at $COMPASS_APP_PATH..."
360371
372+
if [[ "$IS_OSX" == "true" ]]; then
373+
echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/BUILD-14458)"
374+
export COMPASS_E2E_DISABLE_KEYCHAIN_USAGE="true"
375+
echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
376+
export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
377+
fi
378+
361379
DEBUG=${debug} \
362380
MONGODB_VERSION="${mongodb_version|4.4.x}" \
363381
MONGODB_USE_ENTERPRISE="${mongodb_use_enterprise|}" \
@@ -510,4 +528,4 @@ functions:
510528
- command: generate.tasks
511529
params:
512530
files:
513-
- tasks.json
531+
- tasks.json

‎.evergreen/tasks.in.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ tasks:
5050
vars:
5151
compass_distribution: compass
5252
variants: [macos]
53+
- func: save-macos-artifacts
54+
vars:
55+
compass_distribution: compass
56+
variants: [macos_arm]
5357
- func: save-rhel-artifacts
5458
vars:
5559
compass_distribution: compass
@@ -82,6 +86,10 @@ tasks:
8286
vars:
8387
compass_distribution: compass-isolated
8488
variants: [macos]
89+
- func: save-macos-artifacts
90+
vars:
91+
compass_distribution: compass-isolated
92+
variants: [macos_arm]
8593
- func: save-rhel-artifacts
8694
vars:
8795
compass_distribution: compass-isolated
@@ -114,6 +122,10 @@ tasks:
114122
vars:
115123
compass_distribution: compass-readonly
116124
variants: [macos]
125+
- func: save-macos-artifacts
126+
vars:
127+
compass_distribution: compass-readonly
128+
variants: [macos_arm]
117129
- func: save-rhel-artifacts
118130
vars:
119131
compass_distribution: compass-readonly
@@ -171,6 +183,7 @@ tasks:
171183
compass_distribution: compass
172184
- func: test-packaged-app
173185
vars:
186+
mongodb_version: '5.x.x'
174187
compass_distribution: compass
175188
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
176189

@@ -191,14 +204,22 @@ tasks:
191204
vars:
192205
compass_distribution: compass
193206
target_platform: '--platform=win32'
207+
target_arch: '--arch=x64'
194208
- func: apply-compass-target-expansion
195209
vars:
196210
compass_distribution: compass
197211
target_platform: '--platform=linux'
212+
target_arch: '--arch=x64'
198213
- func: apply-compass-target-expansion
199214
vars:
200215
compass_distribution: compass
201216
target_platform: '--platform=darwin'
217+
target_arch: '--arch=x64'
218+
- func: apply-compass-target-expansion
219+
vars:
220+
compass_distribution: compass
221+
target_platform: '--platform=darwin'
222+
target_arch: '--arch=arm64'
202223
- func: get-artifacts
203224
vars:
204225
compass_distribution: compass
@@ -207,14 +228,22 @@ tasks:
207228
vars:
208229
compass_distribution: compass-isolated
209230
target_platform: '--platform=win32'
231+
target_arch: '--arch=x64'
210232
- func: apply-compass-target-expansion
211233
vars:
212234
compass_distribution: compass-isolated
213235
target_platform: '--platform=linux'
236+
target_arch: '--arch=x64'
237+
- func: apply-compass-target-expansion
238+
vars:
239+
compass_distribution: compass-isolated
240+
target_platform: '--platform=darwin'
241+
target_arch: '--arch=x64'
214242
- func: apply-compass-target-expansion
215243
vars:
216244
compass_distribution: compass-isolated
217245
target_platform: '--platform=darwin'
246+
target_arch: '--arch=arm64'
218247
- func: get-artifacts
219248
vars:
220249
compass_distribution: compass-isolated
@@ -223,14 +252,22 @@ tasks:
223252
vars:
224253
compass_distribution: compass-readonly
225254
target_platform: '--platform=win32'
255+
target_arch: '--arch=x64'
226256
- func: apply-compass-target-expansion
227257
vars:
228258
compass_distribution: compass-readonly
229259
target_platform: '--platform=linux'
260+
target_arch: '--arch=x64'
230261
- func: apply-compass-target-expansion
231262
vars:
232263
compass_distribution: compass-readonly
233264
target_platform: '--platform=darwin'
265+
target_arch: '--arch=x64'
266+
- func: apply-compass-target-expansion
267+
vars:
268+
compass_distribution: compass-readonly
269+
target_platform: '--platform=darwin'
270+
target_arch: '--arch=arm64'
234271
- func: get-artifacts
235272
vars:
236273
compass_distribution: compass-readonly
@@ -239,40 +276,64 @@ tasks:
239276
vars:
240277
compass_distribution: compass
241278
target_platform: '--platform=win32'
279+
target_arch: '--arch=x64'
242280
- func: publish
243281
vars:
244282
compass_distribution: compass
245283
target_platform: '--platform=linux'
284+
target_arch: '--arch=x64'
285+
- func: publish
286+
vars:
287+
compass_distribution: compass
288+
target_platform: '--platform=darwin'
289+
target_arch: '--arch=x64'
246290
- func: publish
247291
vars:
248292
compass_distribution: compass
249293
target_platform: '--platform=darwin'
294+
target_arch: '--arch=arm64'
250295

251296
- func: publish
252297
vars:
253298
compass_distribution: compass-isolated
254299
target_platform: '--platform=win32'
300+
target_arch: '--arch=x64'
255301
- func: publish
256302
vars:
257303
compass_distribution: compass-isolated
258304
target_platform: '--platform=linux'
305+
target_arch: '--arch=x64'
259306
- func: publish
260307
vars:
261308
compass_distribution: compass-isolated
262309
target_platform: '--platform=darwin'
310+
target_arch: '--arch=x64'
311+
- func: publish
312+
vars:
313+
compass_distribution: compass-isolated
314+
target_platform: '--platform=darwin'
315+
target_arch: '--arch=arm64'
263316

264317
- func: publish
265318
vars:
266319
compass_distribution: compass-readonly
267320
target_platform: '--platform=win32'
321+
target_arch: '--arch=x64'
268322
- func: publish
269323
vars:
270324
compass_distribution: compass-readonly
271325
target_platform: '--platform=linux'
326+
target_arch: '--arch=x64'
327+
- func: publish
328+
vars:
329+
compass_distribution: compass-readonly
330+
target_platform: '--platform=darwin'
331+
target_arch: '--arch=x64'
272332
- func: publish
273333
vars:
274334
compass_distribution: compass-readonly
275335
target_platform: '--platform=darwin'
336+
target_arch: '--arch=arm64'
276337

277338
# copied as test-packaged-app-macos due to depends_on variation
278339
<% for (const task of testPackagedAppVariations) { %>

0 commit comments

Comments
 (0)