Skip to content

Commit cb024c7

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 0b935da + 59f3023 commit cb024c7

File tree

79 files changed

+4236
-2332
lines changed

Some content is hidden

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

79 files changed

+4236
-2332
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ const SMOKETEST_BUILD_VARIANTS = [
7373
run_on: 'windows-vsCurrent-large',
7474
depends_on: 'package-windows',
7575
},
76-
// {
77-
// name: 'smoketest-rhel',
78-
// display_name: 'Smoketest RHEL',
79-
// run_on: 'rhel80-large',
80-
// depends_on: 'package-rhel',
81-
// },
76+
{
77+
name: 'smoketest-rhel',
78+
display_name: 'Smoketest RHEL',
79+
run_on: 'rhel80-large',
80+
depends_on: 'package-rhel',
81+
},
8282
{
8383
name: 'smoketest-macos-x64',
8484
display_name: 'Smoketest MacOS Intel',

.evergreen/buildvariants-and-tasks.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ buildvariants:
9292
variant: package-windows
9393
tasks:
9494
- name: smoketest-compass
95+
- name: smoketest-rhel-compass
96+
display_name: Smoketest RHEL (compass)
97+
run_on: rhel80-large
98+
depends_on:
99+
- name: package-compass
100+
variant: package-rhel
101+
tasks:
102+
- name: smoketest-compass
95103
- name: smoketest-macos-x64-compass
96104
display_name: Smoketest MacOS Intel (compass)
97105
run_on: macos-14-gui

.evergreen/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ functions:
698698
fi
699699
700700
if [[ "$IS_RHEL" == "true" ]]; then
701-
# TODO: linux_rpm
701+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=linux_rpm --tests=time-to-first-query
702702
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=linux_tar --tests=time-to-first-query
703703
fi
704704

.evergreen/verify-artifacts.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ verify_using_gpg() {
3434
verify_using_powershell() {
3535
echo "Verifying $1 using powershell"
3636
powershell Get-AuthenticodeSignature -FilePath $ARTIFACTS_DIR/$1 > "$TMP_FILE" 2>&1
37+
38+
# Get-AuthenticodeSignature just outputs text, it doesn't exit with a non-zero
39+
# code if the file is not signed
40+
if grep -q NotSigned "$TMP_FILE"; then
41+
echo "File $1 is not signed"
42+
exit 1
43+
fi
3744
}
3845

3946
verify_using_codesign() {

.mailmap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ Anna Herlihy <[email protected]> aherlihy <[email protected]>
1010
Anna Herlihy <[email protected]> anna herlihy <[email protected]>
1111
1212
Brahm Gardner <[email protected]> brahmgardner <[email protected]>
13+
1314
Fred Truman <[email protected]> Fred Truman <[email protected]>
15+
1416
Greenkeeper[bot] <[email protected]> Greenkeeper <[email protected]>
1517
1618
Irina Shestak <[email protected]> Irina Shestak <[email protected]>
1719
Irina Shestak <[email protected]> Irina Shestak <[email protected]>
1820
Irina Shestak <[email protected]> lrlna <[email protected]>
1921
Jack Mulrow <[email protected]> Jack Mulrow <[email protected]>
22+
2023
Jonathan Balsano <[email protected]> Jonathan Balsano <[email protected]>
2124
Jonathan Balsano <[email protected]> Jonathan Balsano <[email protected]>
2225
Joy Sampoonachot <[email protected]> Joy Sampoonachot <[email protected]>
2326
Joy Sampoonachot <[email protected]> Joy Sampoonachot <[email protected]>
2427
2528
Kevin Meyer <[email protected]> kevinat10gen <[email protected]>
29+
2630
Le Roux Bodenstein <[email protected]> <[email protected]>
2731
Lucas Hrabovsky <[email protected]> Lucas Hrabovsky <[email protected]>
2832
Marc Schäffner-Gurney <[email protected]> Marc Schaffner-Gurney <[email protected]>
@@ -36,6 +40,8 @@ Maurizio Casimirri <[email protected]> [email protected] <maur
3640
Maurizio Casimirri <[email protected]> mcasimir <[email protected]>
3741
Maurizio Casimirri <[email protected]> <[email protected]>
3842
Michael Rose <[email protected]> rosem <[email protected]>
43+
44+
3945
Paul Thurlow <[email protected]> Paul Thurlow <[email protected]>
4046
4147
Preston Vasquez <[email protected]> Preston Vasquez <[email protected]>
@@ -49,6 +55,7 @@ Sean Oh <[email protected]> Sean Oh <[email protected]>
4955
Sergey Petushkov <[email protected]> Sergey <[email protected]>
5056
Sergey Petushkov <[email protected]> Sergey Petushkov <[email protected]>
5157
58+
5259
snyk-bot[bot] <[email protected]> snyk-bot <[email protected]>
5360
Thomas Rueckstiess <[email protected]> Thomas Rückstieß <[email protected]>
5461
Thomas Rueckstiess <[email protected]> Thomas Rueckstiess <[email protected]>

0 commit comments

Comments
 (0)