Skip to content

Commit abdc6ed

Browse files
authored
CXX-2797 Remove support for external polyfill libraries (#1257)
* Workaround Catch2 expression decomposition failure on VS 2017 * Tweak wording in release instructions
1 parent 747be06 commit abdc6ed

Some content is hidden

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

41 files changed

+158
-744
lines changed

Diff for: .codecov.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
ignore:
2-
- "src/third_party"

Diff for: .evergreen/config_generator/components/integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
('debian12', None, ['Release'], ['shared', ], [ 20], [None], ['plain', ], [False, True], ['latest'], ['single', ]),
3535
('debian12', None, ['Release'], ['shared', ], [None, ], [None], [ 'csfle'], [False, ], ['latest'], [ 'replica', 'sharded']),
3636

37-
('macos-1100', None, ['Release'], ['shared', 'static'], [None], ['boost'], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
37+
('macos-1100', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
3838

3939
('rhel81-power8', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
4040
('rhel83-zseries', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', '6.0', 'latest'], ['single']),

Diff for: .evergreen/config_generator/components/packaging.py

-29
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,6 @@ class DebianPackageBuild(Function):
3838
]
3939

4040

41-
class DebianPackageBuildMnmlstc(Function):
42-
name = 'build-package-debian-mnmlstc'
43-
desc = 'debian-mnmlstc'
44-
commands = [
45-
bash_exec(
46-
command_type=EvgCommandType.TEST,
47-
working_dir='mongo-cxx-driver',
48-
script='''\
49-
set -o errexit
50-
export IS_PATCH="${is_patch}"
51-
export DEB_BUILD_PROFILES="pkg.mongo-cxx-driver.mnmlstc"
52-
.evergreen/scripts/debian_package_build.sh
53-
''',
54-
),
55-
s3_put(
56-
aws_key='${aws_key}',
57-
aws_secret='${aws_secret}',
58-
bucket='mciuploads',
59-
content_type='${content_type|application/x-gzip}',
60-
display_name='"deb.tar.gz"',
61-
local_file='deb.tar.gz',
62-
permissions='public-read',
63-
remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages-mnmlstc.tar.gz',
64-
),
65-
]
66-
67-
6841
class RpmPackageBuild(Function):
6942
name = 'build-package-rpm'
7043
desc = 'rpm'
@@ -90,7 +63,6 @@ class RpmPackageBuild(Function):
9063
# fmt: off
9164
MATRIX = [
9265
(DebianPackageBuild, 'debian12-latest'),
93-
(DebianPackageBuildMnmlstc, 'debian12-latest'),
9466
(RpmPackageBuild, 'rhel92-arm64' ),
9567
]
9668
# fmt: on
@@ -100,7 +72,6 @@ class RpmPackageBuild(Function):
10072
def functions():
10173
return merge_defns(
10274
DebianPackageBuild.defn(),
103-
DebianPackageBuildMnmlstc.defn(),
10475
RpmPackageBuild.defn(),
10576
)
10677

Diff for: .evergreen/config_generator/components/scan_build.py

-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,9 @@
1717
# fmt: off
1818
MATRIX = [
1919
(11, None ),
20-
(11, 'mnmlstc'),
21-
(11, 'boost' ),
2220
(11, 'impls' ),
2321

2422
(14, None ),
25-
(14, 'mnmlstc'),
26-
(14, 'boost' ),
2723
(14, 'impls' ),
2824

2925
(17, None ),

Diff for: .evergreen/config_generator/components/versioned_api.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
# pylint: disable=line-too-long
2121
# fmt: off
2222
MATRIX = [
23-
('macos-1100', None, ['Release'], ['shared'], ['boost']),
24-
('ubuntu2004', None, ['Debug' ], ['shared'], [None ]),
25-
('windows-vsCurrent', 'vs2019x64', ['Debug' ], ['shared'], [None ]),
23+
('macos-1100', None, ['Release'], ['shared'], [None]),
24+
('ubuntu2004', None, ['Debug' ], ['shared'], [None]),
25+
('windows-vsCurrent', 'vs2019x64', ['Debug' ], ['shared'], [None]),
2626
]
2727
# fmt: on
2828
# pylint: enable=line-too-long
@@ -66,9 +66,8 @@ def tasks():
6666
compile_vars = {'ENABLE_TESTS': 'ON'}
6767
test_vars |= {'MONGOCXX_TEST_TOPOLOGY': 'single'}
6868

69-
match distro.os_type:
70-
case 'macos': compile_vars |= {'BSONCXX_POLYFILL': 'boost'}
71-
case 'windows': test_vars |= {'example_projects_cxx_standard': 17}
69+
if distro.os_type == 'windows':
70+
test_vars |= {'example_projects_cxx_standard': 17}
7271

7372
res.append(
7473
EvgTask(

Diff for: .evergreen/generated_configs/functions.yml

-23
Original file line numberDiff line numberDiff line change
@@ -169,29 +169,6 @@ functions:
169169
local_file: deb.tar.gz
170170
permissions: public-read
171171
remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages.tar.gz
172-
build-package-debian-mnmlstc:
173-
- command: subprocess.exec
174-
type: test
175-
params:
176-
binary: bash
177-
working_dir: mongo-cxx-driver
178-
args:
179-
- -c
180-
- |
181-
set -o errexit
182-
export IS_PATCH="${is_patch}"
183-
export DEB_BUILD_PROFILES="pkg.mongo-cxx-driver.mnmlstc"
184-
.evergreen/scripts/debian_package_build.sh
185-
- command: s3.put
186-
params:
187-
display_name: "\"deb.tar.gz\""
188-
aws_key: ${aws_key}
189-
aws_secret: ${aws_secret}
190-
bucket: mciuploads
191-
content_type: ${content_type|application/x-gzip}
192-
local_file: deb.tar.gz
193-
permissions: public-read
194-
remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages-mnmlstc.tar.gz
195172
build-package-rpm:
196173
- command: subprocess.exec
197174
type: test

0 commit comments

Comments
 (0)