Skip to content

CXX-3215 drop tasks on windows-64-vs2015 or older #1354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2025
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
6 changes: 1 addition & 5 deletions .evergreen/config_generator/components/compile_only.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
('macos-14-arm64', None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
('macos-14', None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),

('windows-64-vs2015', 'vs2015x64', ['Debug', 'Release'], ['shared', 'static'], [11, ]), # CXX-3215
('windows-vsCurrent', 'vs2017x64', ['Debug', 'Release'], ['shared', 'static'], [11, 17, ]),
('windows-vsCurrent', 'vs2019x64', ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, ]),
('windows-vsCurrent', 'vs2022x64', ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, 23]),
Expand Down Expand Up @@ -76,10 +75,7 @@ def tasks():
commands += [
Setup.call(),
InstallCDriver.call(),
] + (
# DEVPROD-13875 + astral-sh/uv/issues/10231.
[] if "vs2015" in distro_name else [InstallUV.call()]
) + [
InstallUV.call(),
Compile.call(
build_type=build_type,
compiler=compiler,
Expand Down
13 changes: 0 additions & 13 deletions .evergreen/config_generator/etc/distros.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ def ls_distro(name, **kwargs):
]

WINDOWS_DISTROS = [
*ls_distro(name='windows-64-vs2015', os='windows', os_type='windows', vs_ver='2015'),
*ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'),
]

Expand Down Expand Up @@ -158,10 +157,6 @@ def make_distro_str(distro_name, compiler, arch) -> str:
# ('windows-64-vs2017', 'vs2017x64', None) -> vs2017-x64
# ('windows-64-vs2017', 'mingw', None) -> vs2017-mingw
distro_str = distro_name[len('windows-64-'):] + {
'vs2013x64': '-x64',
'vs2013x86': '-x86',
'vs2015x64': '-x64',
'vs2015x86': '-x86',
'vs2017x64': '-x64',
'vs2017x86': '-x86',
'vs2019x64': '-x64',
Expand All @@ -182,10 +177,6 @@ def make_distro_str(distro_name, compiler, arch) -> str:

def to_cc(compiler):
return {
'vs2013x64': 'Visual Studio 12 2013',
'vs2013x86': 'Visual Studio 12 2013',
'vs2015x64': 'Visual Studio 14 2015',
'vs2015x86': 'Visual Studio 14 2015',
'vs2017x64': 'Visual Studio 15 2017',
'vs2017x86': 'Visual Studio 15 2017',
'vs2019x64': 'Visual Studio 16 2019',
Expand All @@ -197,10 +188,6 @@ def to_cc(compiler):

def to_platform(compiler):
return {
'vs2013x64': 'x64',
'vs2013x86': 'Win32',
'vs2015x64': 'x64',
'vs2015x86': 'Win32',
'vs2017x64': 'x64',
'vs2017x86': 'Win32',
'vs2019x64': 'x64',
Expand Down
68 changes: 0 additions & 68 deletions .evergreen/generated_configs/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1782,74 +1782,6 @@ tasks:
build_type: Release
cc_compiler: gcc
cxx_compiler: g++
- name: compile-only-vs2015-x64-cxx11-debug-shared
run_on: windows-64-vs2015-large
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, debug, shared]
commands:
- command: expansions.update
params:
updates:
- { key: build_type, value: Debug }
- { key: generator, value: Visual Studio 14 2015 }
- { key: platform, value: x64 }
- func: setup
- func: install_c_driver
- func: compile
vars:
build_type: Debug
generator: Visual Studio 14 2015
platform: x64
- name: compile-only-vs2015-x64-cxx11-debug-static
run_on: windows-64-vs2015-large
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, debug, static]
commands:
- command: expansions.update
params:
updates:
- { key: build_type, value: Debug }
- { key: generator, value: Visual Studio 14 2015 }
- { key: platform, value: x64 }
- func: setup
- func: install_c_driver
- func: compile
vars:
build_type: Debug
generator: Visual Studio 14 2015
platform: x64
- name: compile-only-vs2015-x64-cxx11-release-shared
run_on: windows-64-vs2015-large
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, release, shared]
commands:
- command: expansions.update
params:
updates:
- { key: build_type, value: Release }
- { key: generator, value: Visual Studio 14 2015 }
- { key: platform, value: x64 }
- func: setup
- func: install_c_driver
- func: compile
vars:
build_type: Release
generator: Visual Studio 14 2015
platform: x64
- name: compile-only-vs2015-x64-cxx11-release-static
run_on: windows-64-vs2015-large
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, release, static]
commands:
- command: expansions.update
params:
updates:
- { key: build_type, value: Release }
- { key: generator, value: Visual Studio 14 2015 }
- { key: platform, value: x64 }
- func: setup
- func: install_c_driver
- func: compile
vars:
build_type: Release
generator: Visual Studio 14 2015
platform: x64
- name: compile-only-windows-2019-vs2017-x64-cxx11-debug-shared
run_on: windows-vsCurrent-large
tags: [compile-only, windows-vsCurrent, cxx11, vs2017x64, debug, shared]
Expand Down
10 changes: 1 addition & 9 deletions .evergreen/scripts/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ set -o pipefail
: "${USE_SANITIZER_ASAN:-}"
: "${USE_SANITIZER_UBSAN:-}"
: "${USE_STATIC_LIBS:-}"
: "${UV_INSTALL_DIR:-}" # Not on windows-64-vs2015.

mongoc_prefix="$(pwd)/../mongoc"
echo "mongoc_prefix=${mongoc_prefix:?}"
Expand Down Expand Up @@ -82,14 +81,7 @@ darwin* | linux*)
esac

# Create a VERSION_CURRENT file in the build directory to include in the dist tarball.
if [[ "${distro_id:?}" == windows-64-vs2015* ]]; then
# DEVPROD-13875: Python 3.9 and newer is not available on this distro.
# astral-sh/uv/issues/10231: Astral UV is not able to run properly on this OS+platform either.
# Manually use the Python 3.8 binary instead.
PATH="C:/python/Python38:${PATH:-}" python.exe ./etc/calc_release_version.py >./build/VERSION_CURRENT
else
PATH="${UV_INSTALL_DIR:?}:${PATH:-}" uv run --frozen python ./etc/calc_release_version.py >./build/VERSION_CURRENT
fi
PATH="${UV_INSTALL_DIR:?}:${PATH:-}" uv run --frozen python ./etc/calc_release_version.py >./build/VERSION_CURRENT
cd build

cmake_flags=(
Expand Down