Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
ignore:
- "src/third_party"
2 changes: 1 addition & 1 deletion .evergreen/config_generator/components/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
('debian12', None, ['Release'], ['shared', ], [ 20], [None], ['plain', ], [False, True], ['latest'], ['single', ]),
('debian12', None, ['Release'], ['shared', ], [None, ], [None], [ 'csfle'], [False, ], ['latest'], [ 'replica', 'sharded']),

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

('rhel81-power8', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', 'latest'], ['single']),
('rhel83-zseries', None, ['Release'], ['shared', 'static'], [None], [None], ['plain'], [False, True], ['5.0', '6.0', 'latest'], ['single']),
Expand Down
29 changes: 0 additions & 29 deletions .evergreen/config_generator/components/packaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,6 @@ class DebianPackageBuild(Function):
]


class DebianPackageBuildMnmlstc(Function):
name = 'build-package-debian-mnmlstc'
desc = 'debian-mnmlstc'
commands = [
bash_exec(
command_type=EvgCommandType.TEST,
working_dir='mongo-cxx-driver',
script='''\
set -o errexit
export IS_PATCH="${is_patch}"
export DEB_BUILD_PROFILES="pkg.mongo-cxx-driver.mnmlstc"
.evergreen/scripts/debian_package_build.sh
''',
),
s3_put(
aws_key='${aws_key}',
aws_secret='${aws_secret}',
bucket='mciuploads',
content_type='${content_type|application/x-gzip}',
display_name='"deb.tar.gz"',
local_file='deb.tar.gz',
permissions='public-read',
remote_file='mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages-mnmlstc.tar.gz',
),
]


class RpmPackageBuild(Function):
name = 'build-package-rpm'
desc = 'rpm'
Expand All @@ -90,7 +63,6 @@ class RpmPackageBuild(Function):
# fmt: off
MATRIX = [
(DebianPackageBuild, 'debian12-latest'),
(DebianPackageBuildMnmlstc, 'debian12-latest'),
(RpmPackageBuild, 'rhel92-arm64' ),
]
# fmt: on
Expand All @@ -100,7 +72,6 @@ class RpmPackageBuild(Function):
def functions():
return merge_defns(
DebianPackageBuild.defn(),
DebianPackageBuildMnmlstc.defn(),
RpmPackageBuild.defn(),
)

Expand Down
4 changes: 0 additions & 4 deletions .evergreen/config_generator/components/scan_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@
# fmt: off
MATRIX = [
(11, None ),
(11, 'mnmlstc'),
(11, 'boost' ),
(11, 'impls' ),

(14, None ),
(14, 'mnmlstc'),
(14, 'boost' ),
(14, 'impls' ),

(17, None ),
Expand Down
11 changes: 5 additions & 6 deletions .evergreen/config_generator/components/versioned_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
# pylint: disable=line-too-long
# fmt: off
MATRIX = [
('macos-1100', None, ['Release'], ['shared'], ['boost']),
('ubuntu2004', None, ['Debug' ], ['shared'], [None ]),
('windows-vsCurrent', 'vs2019x64', ['Debug' ], ['shared'], [None ]),
('macos-1100', None, ['Release'], ['shared'], [None]),
('ubuntu2004', None, ['Debug' ], ['shared'], [None]),
('windows-vsCurrent', 'vs2019x64', ['Debug' ], ['shared'], [None]),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down Expand Up @@ -66,9 +66,8 @@ def tasks():
compile_vars = {'ENABLE_TESTS': 'ON'}
test_vars |= {'MONGOCXX_TEST_TOPOLOGY': 'single'}

match distro.os_type:
case 'macos': compile_vars |= {'BSONCXX_POLYFILL': 'boost'}
case 'windows': test_vars |= {'example_projects_cxx_standard': 17}
if distro.os_type == 'windows':
test_vars |= {'example_projects_cxx_standard': 17}

res.append(
EvgTask(
Expand Down
23 changes: 0 additions & 23 deletions .evergreen/generated_configs/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,29 +169,6 @@ functions:
local_file: deb.tar.gz
permissions: public-read
remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages.tar.gz
build-package-debian-mnmlstc:
- command: subprocess.exec
type: test
params:
binary: bash
working_dir: mongo-cxx-driver
args:
- -c
- |
set -o errexit
export IS_PATCH="${is_patch}"
export DEB_BUILD_PROFILES="pkg.mongo-cxx-driver.mnmlstc"
.evergreen/scripts/debian_package_build.sh
- command: s3.put
params:
display_name: "\"deb.tar.gz\""
aws_key: ${aws_key}
aws_secret: ${aws_secret}
bucket: mciuploads
content_type: ${content_type|application/x-gzip}
local_file: deb.tar.gz
permissions: public-read
remote_file: mongo-cxx-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/debian-packages-mnmlstc.tar.gz
build-package-rpm:
- command: subprocess.exec
type: test
Expand Down
Loading