Skip to content

Commit a509211

Browse files
committed
CR fixes
2 parents 9d87c8d + b340d79 commit a509211

File tree

156 files changed

+13032
-14821
lines changed

Some content is hidden

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

156 files changed

+13032
-14821
lines changed

.evergreen.yml

Lines changed: 7376 additions & 12075 deletions
Large diffs are not rendered by default.

.evergreen/.prettierrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"@mongodb-js/prettier-config-devtools"

.evergreen/InstallNode.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ Get-ChildItem -Path $PSScriptRoot
2020
Set-Location -Path $node_dir
2121
Remove-Item .\npm
2222
Remove-Item .\npm.cmd
23+
if (Test-Path .\npm.ps1) { Remove-Item .\npm.ps1 }
2324
Remove-Item .\npx
2425
Remove-Item .\npx.cmd
26+
if (Test-Path .\npx.ps1) { Remove-Item .\npx.ps1 }
2527
Move-Item .\node_modules\npm -Destination .\node_modules\npm2
2628
.\node.exe .\node_modules\npm2\bin\npm-cli.js i -g npm@6
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export type CompileBuildVariant = {
2+
name: string;
3+
displayName: string;
4+
runOn: string;
5+
executableOsId: string;
6+
id?: string;
7+
sharedOpenSsl?: string;
8+
};
9+
10+
export const COMPILE_BUILD_VARIANTS: CompileBuildVariant[];
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
// @ts-check
2+
3+
/** @type {import("./compile-build-variants").CompileBuildVariant[]} */
4+
exports.COMPILE_BUILD_VARIANTS = [
5+
{
6+
displayName: 'RHEL 7.0 x64',
7+
runOn: 'rhel70-build',
8+
executableOsId: 'linux-x64',
9+
},
10+
{
11+
displayName: 'RHEL 8.0 x64',
12+
runOn: 'rhel80-build',
13+
id: 'linux_x64_rhel8',
14+
executableOsId: 'linux-x64',
15+
},
16+
{
17+
displayName: 'RHEL 7.0 x64',
18+
runOn: 'rhel70-build',
19+
executableOsId: 'linux-x64-openssl11',
20+
sharedOpenSsl: 'openssl11',
21+
},
22+
{
23+
displayName: 'RHEL 8.0 x64',
24+
runOn: 'rhel80-build',
25+
id: 'linux_x64_openssl11_rhel8',
26+
executableOsId: 'linux-x64-openssl11',
27+
sharedOpenSsl: 'openssl11',
28+
},
29+
{
30+
displayName: 'RHEL 7.0 x64',
31+
runOn: 'rhel70-build',
32+
executableOsId: 'linux-x64-openssl3',
33+
sharedOpenSsl: 'openssl3',
34+
},
35+
{
36+
displayName: 'RHEL 8.0 x64',
37+
runOn: 'rhel80-build',
38+
id: 'linux_x64_openssl3_rhel8',
39+
executableOsId: 'linux-x64-openssl3',
40+
sharedOpenSsl: 'openssl3',
41+
},
42+
{
43+
displayName: 'Amazon 2 arm64',
44+
runOn: 'amazon2-arm64-large',
45+
executableOsId: 'linux-arm64',
46+
},
47+
{
48+
displayName: 'Amazon 2 arm64',
49+
runOn: 'amazon2-arm64-large',
50+
executableOsId: 'linux-arm64-openssl11',
51+
sharedOpenSsl: 'openssl11',
52+
},
53+
{
54+
displayName: 'Amazon 2 arm64',
55+
runOn: 'amazon2-arm64-large',
56+
executableOsId: 'linux-arm64-openssl3',
57+
sharedOpenSsl: 'openssl3',
58+
},
59+
{
60+
displayName: 'RHEL 8 PPC',
61+
runOn: 'rhel8-power-small',
62+
executableOsId: 'linux-ppc64le',
63+
},
64+
{
65+
displayName: 'RHEL 7 s390x',
66+
runOn: 'rhel7-zseries-large',
67+
executableOsId: 'linux-s390x',
68+
},
69+
{
70+
displayName: 'MacOS Big Sur',
71+
id: 'darwin',
72+
runOn: 'macos-11',
73+
executableOsId: 'darwin-x64',
74+
},
75+
{
76+
displayName: 'MacOS Big Sur arm64',
77+
runOn: 'macos-11-arm64',
78+
executableOsId: 'darwin-arm64',
79+
},
80+
{
81+
id: 'win32',
82+
displayName: 'Windows VS 2022',
83+
runOn: 'windows-vsCurrent-large',
84+
executableOsId: 'win32',
85+
},
86+
].map((buildVariant) => {
87+
const { displayName, sharedOpenSsl, id, executableOsId } = buildVariant;
88+
const formattedDisplayName = [displayName, sharedOpenSsl, '(Build)']
89+
.filter((text) => text)
90+
.join(' ');
91+
92+
return {
93+
...buildVariant,
94+
id,
95+
displayName: formattedDisplayName,
96+
name: `build_${id ?? executableOsId.replaceAll('-', '_')}`,
97+
};
98+
});
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export type E2ETestsBuildVariant = {
2+
displayName: string;
3+
name: string;
4+
compileBuildVariant: string;
5+
runOn: string;
6+
executableOsId: string;
7+
mVersion: string;
8+
tags?: string[];
9+
disableOpenSslSharedConfig?: boolean;
10+
fips?: boolean;
11+
additionalTasks?: string[];
12+
};
13+
14+
export const E2E_TESTS_BUILD_VARIANTS: E2ETestsBuildVariant[];

0 commit comments

Comments
 (0)