Skip to content

Commit 509d9cf

Browse files
committed
Merge remote-tracking branch 'origin/master' into 1.27-releases
Conflicts: package-lock.json package.json packages/compass/package-lock.json packages/compass/package.json
2 parents 6bf365b + a7a9165 commit 509d9cf

File tree

4,428 files changed

+1566534
-2496
lines changed

Some content is hidden

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

4,428 files changed

+1566534
-2496
lines changed

.evergreen.yml

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ functions:
134134
135135
echo "If npm ci fails, debug.log will be uploaded to S3."
136136
npm ci --unsafe-perm
137+
# Make sure that cache is populated when other packages are pulling the font
138+
npm run update-akzidenz-cache
139+
# Run npm ci in all the packages
140+
npm run bootstrap-evergreen
141+
137142
save:
138143
- command: shell.exec
139144
params:
@@ -177,7 +182,7 @@ functions:
177182
source ~/compass_env.sh
178183
179184
echo "Run static analysis..."
180-
npm run check;
185+
npm run check-evergreen
181186
182187
test:
183188
- command: shell.exec
@@ -197,7 +202,9 @@ functions:
197202
# have dropped support for macOS 10.10 because it is now outside
198203
# of the supported version range.
199204
# https://docs.google.com/document/d/1IfQGC7wTtrlsc2SqURirvt_4uMuU606nXNbu-stw6bQ/edit
200-
DEBUG=* MONGODB_VERSION=${mongodb_version|4.0.3} npm test -- --${test_suite}
205+
#
206+
# test_suite option only affects compass tests
207+
DEBUG=mongo*,mocha*,hadron* MONGODB_VERSION=${mongodb_version|4.0.3} npm run test-evergreen
201208
# - command: attach.results
202209
# params:
203210
# file_location: src/test-results.xml
@@ -361,6 +368,7 @@ functions:
361368
local_file: src/packages/compass/dist/${osx_zip_filename}
362369
remote_file: ${project}/${revision}/${osx_zip_filename}
363370
content_type: application/zip
371+
364372
'save linux artifacts':
365373
# .deb
366374
- <<: *save-artifact
@@ -374,6 +382,7 @@ functions:
374382
local_file: src/packages/compass/dist/${linux_tar_filename}
375383
remote_file: ${project}/${revision}/${linux_tar_filename}
376384
content_type: application/x-gzip
385+
377386
'save rhel artifacts':
378387
# .rpm
379388
- <<: *save-artifact
@@ -387,36 +396,72 @@ functions:
387396
local_file: src/packages/compass/dist/${linux_tar_filename}
388397
remote_file: ${project}/${revision}/${linux_tar_filename}
389398
content_type: application/x-gzip
399+
390400
# Tasks
391401
tasks:
392402
- name: oneshot-compile-test-package-publish
393403
commands:
394404
- func: prepare
405+
395406
- func: install
396-
# - func: test
397-
# vars:
398-
# test_suite: functional
407+
408+
- func: verify
409+
410+
- func: test
411+
# TODO: rhel, ubuntu, windows should be brought back as soon as following
412+
# issues are resolved:
413+
# - https://jira.mongodb.org/browse/COMPASS-4789
414+
# - https://jira.mongodb.org/browse/COMPASS-4791
415+
# - https://jira.mongodb.org/browse/COMPASS-4792
416+
# - https://jira.mongodb.org/browse/COMPASS-4793
417+
# - https://jira.mongodb.org/browse/COMPASS-4794
418+
# - https://jira.mongodb.org/browse/COMPASS-4795
419+
variants: [macos]
420+
399421
- func: package
400422
vars:
401423
compass_distribution: compass
402424
- func: publish
403425
vars:
404426
compass_distribution: compass
427+
- func: 'save windows artifacts'
428+
variants: [windows]
405429
- func: 'save osx artifacts'
430+
variants: [macos]
431+
- func: 'save linux artifacts'
432+
variants: [ubuntu]
433+
- func: 'save rhel artifacts'
434+
variants: [rhel]
435+
406436
- func: package
407437
vars:
408438
compass_distribution: compass-isolated
409439
- func: publish
410440
vars:
411441
compass_distribution: compass-isolated
442+
- func: 'save windows artifacts'
443+
variants: [windows]
412444
- func: 'save osx artifacts'
445+
variants: [macos]
446+
- func: 'save linux artifacts'
447+
variants: [ubuntu]
448+
- func: 'save rhel artifacts'
449+
variants: [rhel]
450+
413451
- func: package
414452
vars:
415453
compass_distribution: compass-readonly
416454
- func: publish
417455
vars:
418456
compass_distribution: compass-readonly
457+
- func: 'save windows artifacts'
458+
variants: [windows]
419459
- func: 'save osx artifacts'
460+
variants: [macos]
461+
- func: 'save linux artifacts'
462+
variants: [ubuntu]
463+
- func: 'save rhel artifacts'
464+
variants: [rhel]
420465

421466
- name: compile
422467
depends_on: []
@@ -432,6 +477,7 @@ tasks:
432477
commands:
433478
- func: restore
434479
- func: verify
480+
435481
- name: test-unit
436482
depends_on: [compile]
437483
tags:
@@ -634,55 +680,20 @@ buildvariants:
634680

635681
- name: windows
636682
display_name: Windows
637-
run_on: windows-64-vs2015-test
683+
run_on: windows-vsCurrent-large
638684
expansions:
639685
compass_distribution: compass
640686
tasks:
641-
- name: compile
642-
- name: verify
643-
# - name: test-data-service
644-
# - name: test-functional
645-
# - name: test-hadron-spectron
646-
# - name: test-connect-plugin
647-
# - name: test-aggregation-builder-plugin
648-
# NOTE (@imlucas) See above for activating more tests
649-
- name: test-unit
650-
# - name: test-main
651-
# - name: test-renderer
652-
# - name: test-enzyme
653-
# - name: test-functional-stable-server
654-
# - name: test-functional-unstable-server
655-
# - name: test-functional-36x-server
656-
# - name: test-functional-34x-server
657-
# - name: test-functional-26x-server
658-
- name: package-and-publish-compass
659-
- name: package-and-publish-compass-isolated
660-
- name: package-and-publish-compass-readonly
687+
- name: oneshot-compile-test-package-publish
661688

662689
- name: ubuntu
663690
display_name: Ubuntu
664-
run_on: ubuntu1404-test
691+
run_on: ubuntu1404-large
665692
tasks:
666-
- name: compile
667-
- name: verify
668-
- name: test-data-service
669-
# - name: test-unit
670-
# - name: test-main
671-
# - name: test-renderer
672-
# - name: test-enzyme
673-
# - name: test-functional
674-
# - name: test-connect-plugin
675-
# - name: test-aggregation-builder-plugin
676-
- name: package-and-publish-compass
677-
- name: package-and-publish-compass-isolated
678-
- name: package-and-publish-compass-readonly
693+
- name: oneshot-compile-test-package-publish
694+
679695
- name: rhel
680696
display_name: RHEL
681-
run_on: rhel70
697+
run_on: rhel76-large
682698
tasks:
683-
- name: compile
684-
- name: verify
685-
# - name: test-functional
686-
- name: package-and-publish-compass
687-
- name: package-and-publish-compass-isolated
688-
- name: package-and-publish-compass-readonly
699+
- name: oneshot-compile-test-package-publish

.evergreen/pretest.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ if [ -n "$IS_LINUX" ]; then
3232
sudo sh -e /etc/init.d/xvfb start;
3333
sleep 3;
3434

35+
# Some arcane hack to fix keyring issue
36+
# https://github.com/atom/node-keytar/issues/132#issuecomment-444159414
3537
eval $(dbus-launch --sh-syntax);
3638
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login);
3739
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start);

.github/workflows/pr.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,19 @@ jobs:
2424
uses: actions/[email protected]
2525
with:
2626
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
27-
node-version: 12.4.0
27+
node-version: ^12.4.0
2828

29-
- name: Install Deps Ubuntu
30-
run: sudo apt-get -y install libkrb5-dev libsecret-1-dev net-tools libstdc++6 gnome-keyring
29+
# - name: Install Deps Ubuntu
30+
# run: sudo apt-get -y install libkrb5-dev libsecret-1-dev net-tools libstdc++6 gnome-keyring
3131

32-
- name: Install Dependencies
33-
run: npm ci
32+
- name: Not Implemented
33+
run: echo "GitHub Actions workflows are disabled for now. To be fixed in https://jira.mongodb.org/browse/COMPASS-4788"
3434

35-
- name: Run Checks
36-
run: npm run check
35+
# - name: Install Dependencies
36+
# run: npm ci
3737

38-
- name: Run Tests
39-
run: npm run test
38+
# - name: Run Checks
39+
# run: npm run check
40+
41+
# - name: Run Tests
42+
# run: npm run test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ report.json
1313
expansions.yml
1414
.nvmrc
1515
.vscode
16+
.migration-cache

0 commit comments

Comments
 (0)