Skip to content

Commit f6e6ee1

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 1c3404a + bfddd0a commit f6e6ee1

File tree

570 files changed

+14000
-8981
lines changed

Some content is hidden

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

570 files changed

+14000
-8981
lines changed

‎.evergreen/buildvariants-and-tasks.in.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,11 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
108108
];
109109
110110
const EOL_SERVER_VERSIONS = [
111-
{ name: '44x-community', version: '4.4.x' },
112-
{ name: '44x-enterprise', version: '4.4.x-enterprise' },
113-
{ name: '5x-community', version: '5.x.x' },
114-
{ name: '5x-enterprise', version: '5.x.x-enterprise' }
111+
{ name: '60x-community', version: '6.0.x' },
112+
{ name: '60x-enterprise', version: '6.0.x-enterprise' },
115113
];
116114
117115
const MAINTAINED_SERVER_VERSIONS = [
118-
{ name: '60x-community', version: '6.0.x' },
119-
{ name: '60x-enterprise', version: '6.0.x-enterprise' },
120116
{ name: '70x-community', version: '7.0.x' },
121117
{ name: '70x-enterprise', version: '7.0.x-enterprise' },
122118
{ name: '80x-community', version: '8.0.x' },
@@ -258,6 +254,11 @@ buildvariants:
258254
tasks:
259255
- name: publish
260256
- name: publish-dev-release-info
257+
258+
- name: static-analysis
259+
display_name: Create Static Analysis Report
260+
run_on: ubuntu2004-large
261+
tasks:
261262
- name: create_static_analysis_report
262263

263264
- name: connectivity-tests

‎.evergreen/buildvariants-and-tasks.yml‎

Lines changed: 10 additions & 294 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,12 @@ buildvariants:
120120
- name: package-compass
121121
variant: package-ubuntu
122122
tasks:
123-
- name: test-server-44x-community-1
124-
- name: test-server-44x-community-2
125-
- name: test-server-44x-community-3
126-
- name: test-server-44x-enterprise-1
127-
- name: test-server-44x-enterprise-2
128-
- name: test-server-44x-enterprise-3
129-
- name: test-server-5x-community-1
130-
- name: test-server-5x-community-2
131-
- name: test-server-5x-community-3
132-
- name: test-server-5x-enterprise-1
133-
- name: test-server-5x-enterprise-2
134-
- name: test-server-5x-enterprise-3
123+
- name: test-server-60x-community-1
124+
- name: test-server-60x-community-2
125+
- name: test-server-60x-community-3
126+
- name: test-server-60x-enterprise-1
127+
- name: test-server-60x-enterprise-2
128+
- name: test-server-60x-enterprise-3
135129
- name: test-maintained-servers
136130
display_name: Test Maintained Servers
137131
run_on: ubuntu2004-large
@@ -140,12 +134,6 @@ buildvariants:
140134
- name: package-compass
141135
variant: package-ubuntu
142136
tasks:
143-
- name: test-server-60x-community-1
144-
- name: test-server-60x-community-2
145-
- name: test-server-60x-community-3
146-
- name: test-server-60x-enterprise-1
147-
- name: test-server-60x-enterprise-2
148-
- name: test-server-60x-enterprise-3
149137
- name: test-server-70x-community-1
150138
- name: test-server-70x-community-2
151139
- name: test-server-70x-community-3
@@ -252,6 +240,10 @@ buildvariants:
252240
tasks:
253241
- name: publish
254242
- name: publish-dev-release-info
243+
- name: static-analysis
244+
display_name: Create Static Analysis Report
245+
run_on: ubuntu2004-large
246+
tasks:
255247
- name: create_static_analysis_report
256248
- name: connectivity-tests
257249
display_name: Connectivity Tests
@@ -510,282 +502,6 @@ tasks:
510502
- func: smoketest-on-github-actions
511503
vars:
512504
debug: compass-e2e-tests*,electron*,hadron*,mongo*
513-
- name: test-server-44x-community-1
514-
tags:
515-
- required-for-publish
516-
- run-on-pr
517-
commands:
518-
- func: prepare
519-
- func: install
520-
- func: bootstrap
521-
vars:
522-
scope: compass-e2e-tests
523-
- func: apply-compass-target-expansion
524-
vars:
525-
compass_distribution: compass
526-
- func: get-packaged-app
527-
vars:
528-
compass_distribution: compass
529-
- func: test-packaged-app
530-
vars:
531-
mongodb_version: 4.4.x
532-
compass_distribution: compass
533-
e2e_test_groups: 3
534-
e2e_test_group: 1
535-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
536-
- name: test-server-44x-community-2
537-
tags:
538-
- required-for-publish
539-
- run-on-pr
540-
commands:
541-
- func: prepare
542-
- func: install
543-
- func: bootstrap
544-
vars:
545-
scope: compass-e2e-tests
546-
- func: apply-compass-target-expansion
547-
vars:
548-
compass_distribution: compass
549-
- func: get-packaged-app
550-
vars:
551-
compass_distribution: compass
552-
- func: test-packaged-app
553-
vars:
554-
mongodb_version: 4.4.x
555-
compass_distribution: compass
556-
e2e_test_groups: 3
557-
e2e_test_group: 2
558-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
559-
- name: test-server-44x-community-3
560-
tags:
561-
- required-for-publish
562-
- run-on-pr
563-
commands:
564-
- func: prepare
565-
- func: install
566-
- func: bootstrap
567-
vars:
568-
scope: compass-e2e-tests
569-
- func: apply-compass-target-expansion
570-
vars:
571-
compass_distribution: compass
572-
- func: get-packaged-app
573-
vars:
574-
compass_distribution: compass
575-
- func: test-packaged-app
576-
vars:
577-
mongodb_version: 4.4.x
578-
compass_distribution: compass
579-
e2e_test_groups: 3
580-
e2e_test_group: 3
581-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
582-
- name: test-server-44x-enterprise-1
583-
tags:
584-
- required-for-publish
585-
- run-on-pr
586-
commands:
587-
- func: prepare
588-
- func: install
589-
- func: bootstrap
590-
vars:
591-
scope: compass-e2e-tests
592-
- func: apply-compass-target-expansion
593-
vars:
594-
compass_distribution: compass
595-
- func: get-packaged-app
596-
vars:
597-
compass_distribution: compass
598-
- func: test-packaged-app
599-
vars:
600-
mongodb_version: 4.4.x-enterprise
601-
compass_distribution: compass
602-
e2e_test_groups: 3
603-
e2e_test_group: 1
604-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
605-
- name: test-server-44x-enterprise-2
606-
tags:
607-
- required-for-publish
608-
- run-on-pr
609-
commands:
610-
- func: prepare
611-
- func: install
612-
- func: bootstrap
613-
vars:
614-
scope: compass-e2e-tests
615-
- func: apply-compass-target-expansion
616-
vars:
617-
compass_distribution: compass
618-
- func: get-packaged-app
619-
vars:
620-
compass_distribution: compass
621-
- func: test-packaged-app
622-
vars:
623-
mongodb_version: 4.4.x-enterprise
624-
compass_distribution: compass
625-
e2e_test_groups: 3
626-
e2e_test_group: 2
627-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
628-
- name: test-server-44x-enterprise-3
629-
tags:
630-
- required-for-publish
631-
- run-on-pr
632-
commands:
633-
- func: prepare
634-
- func: install
635-
- func: bootstrap
636-
vars:
637-
scope: compass-e2e-tests
638-
- func: apply-compass-target-expansion
639-
vars:
640-
compass_distribution: compass
641-
- func: get-packaged-app
642-
vars:
643-
compass_distribution: compass
644-
- func: test-packaged-app
645-
vars:
646-
mongodb_version: 4.4.x-enterprise
647-
compass_distribution: compass
648-
e2e_test_groups: 3
649-
e2e_test_group: 3
650-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
651-
- name: test-server-5x-community-1
652-
tags:
653-
- required-for-publish
654-
- run-on-pr
655-
commands:
656-
- func: prepare
657-
- func: install
658-
- func: bootstrap
659-
vars:
660-
scope: compass-e2e-tests
661-
- func: apply-compass-target-expansion
662-
vars:
663-
compass_distribution: compass
664-
- func: get-packaged-app
665-
vars:
666-
compass_distribution: compass
667-
- func: test-packaged-app
668-
vars:
669-
mongodb_version: 5.x.x
670-
compass_distribution: compass
671-
e2e_test_groups: 3
672-
e2e_test_group: 1
673-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
674-
- name: test-server-5x-community-2
675-
tags:
676-
- required-for-publish
677-
- run-on-pr
678-
commands:
679-
- func: prepare
680-
- func: install
681-
- func: bootstrap
682-
vars:
683-
scope: compass-e2e-tests
684-
- func: apply-compass-target-expansion
685-
vars:
686-
compass_distribution: compass
687-
- func: get-packaged-app
688-
vars:
689-
compass_distribution: compass
690-
- func: test-packaged-app
691-
vars:
692-
mongodb_version: 5.x.x
693-
compass_distribution: compass
694-
e2e_test_groups: 3
695-
e2e_test_group: 2
696-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
697-
- name: test-server-5x-community-3
698-
tags:
699-
- required-for-publish
700-
- run-on-pr
701-
commands:
702-
- func: prepare
703-
- func: install
704-
- func: bootstrap
705-
vars:
706-
scope: compass-e2e-tests
707-
- func: apply-compass-target-expansion
708-
vars:
709-
compass_distribution: compass
710-
- func: get-packaged-app
711-
vars:
712-
compass_distribution: compass
713-
- func: test-packaged-app
714-
vars:
715-
mongodb_version: 5.x.x
716-
compass_distribution: compass
717-
e2e_test_groups: 3
718-
e2e_test_group: 3
719-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
720-
- name: test-server-5x-enterprise-1
721-
tags:
722-
- required-for-publish
723-
- run-on-pr
724-
commands:
725-
- func: prepare
726-
- func: install
727-
- func: bootstrap
728-
vars:
729-
scope: compass-e2e-tests
730-
- func: apply-compass-target-expansion
731-
vars:
732-
compass_distribution: compass
733-
- func: get-packaged-app
734-
vars:
735-
compass_distribution: compass
736-
- func: test-packaged-app
737-
vars:
738-
mongodb_version: 5.x.x-enterprise
739-
compass_distribution: compass
740-
e2e_test_groups: 3
741-
e2e_test_group: 1
742-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
743-
- name: test-server-5x-enterprise-2
744-
tags:
745-
- required-for-publish
746-
- run-on-pr
747-
commands:
748-
- func: prepare
749-
- func: install
750-
- func: bootstrap
751-
vars:
752-
scope: compass-e2e-tests
753-
- func: apply-compass-target-expansion
754-
vars:
755-
compass_distribution: compass
756-
- func: get-packaged-app
757-
vars:
758-
compass_distribution: compass
759-
- func: test-packaged-app
760-
vars:
761-
mongodb_version: 5.x.x-enterprise
762-
compass_distribution: compass
763-
e2e_test_groups: 3
764-
e2e_test_group: 2
765-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
766-
- name: test-server-5x-enterprise-3
767-
tags:
768-
- required-for-publish
769-
- run-on-pr
770-
commands:
771-
- func: prepare
772-
- func: install
773-
- func: bootstrap
774-
vars:
775-
scope: compass-e2e-tests
776-
- func: apply-compass-target-expansion
777-
vars:
778-
compass_distribution: compass
779-
- func: get-packaged-app
780-
vars:
781-
compass_distribution: compass
782-
- func: test-packaged-app
783-
vars:
784-
mongodb_version: 5.x.x-enterprise
785-
compass_distribution: compass
786-
e2e_test_groups: 3
787-
e2e_test_group: 3
788-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
789505
- name: test-server-60x-community-1
790506
tags:
791507
- required-for-publish

‎.evergreen/start-docker-envs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [ "$HAS_DOCKER" = true ]; then
3939
LOGS_DIR="$SCRIPT_DIR/logs"
4040
mkdir -p "$LOGS_DIR"
4141

42-
git clone -b v1.3.2 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
42+
git clone -b v1.3.4 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
4343
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
4444
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
4545
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d

‎.snyk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ ignore:
77
reason: >-
88
Not applicable as we do not use a valueFormatter or cellRenderer
99
function
10-
expires: 2025-09-17T13:05:57.065Z
1110
created: 2024-01-18T18:27:24.353Z
1211
SNYK-JS-AGGRIDCOMMUNITY-7414157:
1312
- '*':
1413
reason: >-
1514
Not applicable as we don't use ag-grid utils and the library never
1615
passes user input directly to the merge function
17-
expires: 2025-09-17T13:05:57.065Z
1816
created: 2024-09-17T13:05:57.071Z
1917
SNYK-JS-ELECTRON-8642944:
2018
- '*':

‎AUTHORS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,6 @@ Nataly Carbonell <[email protected]>
113113
DarshanaVenkatesh <[email protected]>
114114
Kevin Pamaran <[email protected]>
115115
Leo Generali <[email protected]>
116+
Ivan Medina <[email protected]>
117+
Nick Larew <[email protected]>
118+
Shun Miyazawa <[email protected]>

0 commit comments

Comments
 (0)