Skip to content

Commit 51c82b9

Browse files
committed
Merge branch 'master' into 1.27-releases
2 parents a887584 + 0213c57 commit 51c82b9

File tree

1,363 files changed

+203146
-374663
lines changed

Some content is hidden

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

1,363 files changed

+203146
-374663
lines changed

.evergreen.yml

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
stepback: false
2-
exec_timeout_secs: 3600
2+
exec_timeout_secs: 5400
3+
ignore:
4+
- AUTHORS
5+
- THIRD-PARTY-NOTICES.md
36

47
## Variables
58
variables:
@@ -133,12 +136,13 @@ functions:
133136
echo "Installing Compass dependencies..."
134137
135138
echo "If npm ci fails, debug.log will be uploaded to S3."
139+
# We are running everything with --unsafe-perm because RHEL evergreen user is root
136140
npm ci --unsafe-perm
137141
# Make sure that cache is populated when other packages are pulling the font
138-
npm run update-akzidenz-cache
142+
npm run update-akzidenz-cache --unsafe-perm
139143
# Run npm ci in all the packages
140-
npm run bootstrap-evergreen
141-
144+
npm run bootstrap-evergreen --unsafe-perm
145+
142146
save:
143147
- command: shell.exec
144148
params:
@@ -202,9 +206,10 @@ functions:
202206
# have dropped support for macOS 10.10 because it is now outside
203207
# of the supported version range.
204208
# https://docs.google.com/document/d/1IfQGC7wTtrlsc2SqURirvt_4uMuU606nXNbu-stw6bQ/edit
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
209+
# debug option is not very useful in normal runs, but helpful when
210+
# debugging any issues with tests. Set to "mocha*", "hadron*", or
211+
# "mongo*" for some helpful output from the test tooling we are using
212+
DEBUG=${debug} MONGODB_VERSION=${mongodb_version|4.0.3} npm run test-evergreen --unsafe-perm
208213
# - command: attach.results
209214
# params:
210215
# file_location: src/test-results.xml
@@ -368,7 +373,7 @@ functions:
368373
local_file: src/packages/compass/dist/${osx_zip_filename}
369374
remote_file: ${project}/${revision}/${osx_zip_filename}
370375
content_type: application/zip
371-
376+
372377
'save linux artifacts':
373378
# .deb
374379
- <<: *save-artifact
@@ -382,7 +387,7 @@ functions:
382387
local_file: src/packages/compass/dist/${linux_tar_filename}
383388
remote_file: ${project}/${revision}/${linux_tar_filename}
384389
content_type: application/x-gzip
385-
390+
386391
'save rhel artifacts':
387392
# .rpm
388393
- <<: *save-artifact
@@ -408,15 +413,9 @@ tasks:
408413
- func: verify
409414

410415
- 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]
416+
variants: [macos, windows, ubuntu, rhel]
417+
vars:
418+
debug: "mongo*"
420419

421420
- func: package
422421
vars:
@@ -496,12 +495,6 @@ tasks:
496495
vars:
497496
test_suite: functional
498497

499-
- name: test-hadron-spectron
500-
depends_on: [compile]
501-
commands:
502-
- func: test-plugin
503-
vars: { plugin: mongodb-js/hadron-spectron }
504-
505498
- name: test-data-service
506499
depends_on: [compile]
507500
commands:
@@ -688,7 +681,7 @@ buildvariants:
688681

689682
- name: ubuntu
690683
display_name: Ubuntu
691-
run_on: ubuntu1404-large
684+
run_on: ubuntu1604-large
692685
tasks:
693686
- name: oneshot-compile-test-package-publish
694687

.evergreen/pretest.sh

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,3 @@ else
1515
export IS_UBUNTU=true
1616
fi
1717
fi
18-
19-
if [ -n "$IS_LINUX" ]; then
20-
if [ -n "$IS_UBUNTU" ]; then
21-
sudo apt-get install -y gnome-keyring python-gnomekeyring
22-
else
23-
yum localinstall -y http://mirror.centos.org/centos/7/os/x86_64/Packages/gnome-keyring-3.28.2-1.el7.x86_64.rpm
24-
yum localinstall -y http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/python2-keyring-5.0-3.el7.noarch.rpm
25-
fi
26-
27-
sudo cp .evergreen/xvfb-service.sh /etc/init.d/xvfb;
28-
sudo chmod +x /etc/init.d/xvfb;
29-
30-
export NO_AT_BRIDGE=1
31-
export DISPLAY=:99.0;
32-
sudo sh -e /etc/init.d/xvfb start;
33-
sleep 3;
34-
35-
# Some arcane hack to fix keyring issue
36-
# https://github.com/atom/node-keytar/issues/132#issuecomment-444159414
37-
eval $(dbus-launch --sh-syntax);
38-
eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login);
39-
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start);
40-
/usr/bin/python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');";
41-
fi
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
on:
2+
# Once a week or on pushes to main
3+
schedule:
4+
- cron: "0 3 * * 0"
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
update_generated_files:
11+
name: Update automatically generated files
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v1
15+
- uses: actions/setup-node@v2
16+
with:
17+
node-version: '12'
18+
- name: Install Dependencies
19+
run: npm i
20+
- name: Set up Git
21+
run: |
22+
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
23+
git config --local user.name "github-actions[bot]"
24+
- name: Update THIRD-PARTY-NOTICES.md
25+
run: npm run update-third-party-notices
26+
- name: Commit THIRD-PARTY-NOTICES changes
27+
run: |
28+
git commit --no-allow-empty -m "chore: update THIRD-PARTY-NOTICES" THIRD-PARTY-NOTICES.md || true
29+
- name: Update AUTHORS
30+
run: npm run update-authors
31+
- name: Commit AUTHORS changes
32+
run: |
33+
git commit --no-allow-empty -m "chore: update AUTHORS" AUTHORS || true
34+
- name: Push updates
35+
uses: ad-m/[email protected]
36+
with:
37+
github_token: ${{ secrets.GITHUB_TOKEN }}
38+
branch: master

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ expansions.yml
1414
.nvmrc
1515
.vscode
1616
.migration-cache
17+
lerna-debug.log
18+
packages/**/*.tgz

.mailmap

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Alena Khineika <[email protected]> Alena Khineika <>
2+
Alena Khineika <[email protected]> Alena Khineika <[email protected]>
3+
Alena Khineika <[email protected]> Alena Khineika <unknown>
4+
Anna Henningsen <[email protected]> Anna Henningsen <[email protected]>
5+
Anna Henningsen <[email protected]> Anna Henningsen <[email protected]>
6+
Anna Henningsen <[email protected]> Anna Henningsen <[email protected]>
7+
Anna Herlihy <[email protected]> aherlihy <[email protected]>
8+
Anna Herlihy <[email protected]> anna herlihy <[email protected]>
9+
Brahm Gardner <[email protected]> brahmgardner <[email protected]>
10+
Fred Truman <[email protected]> Fred Truman <[email protected]>
11+
Greenkeeper[bot] <[email protected]> Greenkeeper <[email protected]>
12+
Irina Shestak <[email protected]> Irina Shestak <[email protected]>
13+
Irina Shestak <[email protected]> Irina Shestak <[email protected]>
14+
Irina Shestak <[email protected]> lrlna <[email protected]>
15+
Jack Mulrow <[email protected]> Jack Mulrow <[email protected]>
16+
Jonathan Balsano <[email protected]> Jonathan Balsano <[email protected]>
17+
Jonathan Balsano <[email protected]> Jonathan Balsano <[email protected]>
18+
Joy Sampoonachot <[email protected]> Joy Sampoonachot <[email protected]>
19+
Joy Sampoonachot <[email protected]> Joy Sampoonachot <[email protected]>
20+
Kevin Meyer <[email protected]> kevinat10gen <[email protected]>
21+
Lucas Hrabovsky <[email protected]> Lucas Hrabovsky <[email protected]>
22+
Marc Schäffner-Gurney <[email protected]> Marc Schaffner-Gurney <[email protected]>
23+
Massimiliano Marcon <[email protected]>Massimiliano Marcon <[email protected]>
24+
Matt Cotter <[email protected]> Matt Cotter <[email protected]>
25+
Matt Fairbrass <[email protected]> Matt Fairbrass <[email protected]>
26+
Matt Kangas <[email protected]> Matt Kangas <[email protected]>
27+
Maurizio Casimirri <[email protected]> Maurizio Casimirri <[email protected]>
28+
29+
Maurizio Casimirri <[email protected]> mcasimir <[email protected]>
30+
Michael Rose <[email protected]> rosem <[email protected]>
31+
Paul Thurlow <[email protected]> Paul Thurlow <[email protected]>
32+
Rhys Howell <rhys@[email protected]> Anemy <rhys@[email protected]>
33+
Rhys Howell <rhys@[email protected]> Rhys <[email protected]>
34+
Rhys Howell <rhys@[email protected]> Rhys Howell <[email protected]>
35+
36+
Satya Sinha <[email protected]> satyasinha <[email protected]>
37+
38+
Sergey Petushkov <[email protected]> Sergey <[email protected]>
39+
Sergey Petushkov <[email protected]> Sergey Petushkov <[email protected]>
40+
snyk-bot[bot] <[email protected]> snyk-bot <[email protected]>
41+
Thomas Rueckstiess <[email protected]> Thomas Rückstieß <[email protected]>
42+
Thomas Rueckstiess <[email protected]> Thomas Rueckstiess <[email protected]>
43+
Thomas Rueckstiess <[email protected]> Thomas Rueckstiess <[email protected]>
44+
45+
46+
Yonatan Schreiber <[email protected]> yonatan <[email protected]>
47+
Yonatan Schreiber <[email protected]> yonatan s <[email protected]>

0 commit comments

Comments
 (0)