Skip to content

Commit 7a0215b

Browse files
authored
CXX-3215 drop tasks on windows-64-vs2015 or older (#1354)
1 parent 05996a5 commit 7a0215b

File tree

4 files changed

+2
-95
lines changed

4 files changed

+2
-95
lines changed

.evergreen/config_generator/components/compile_only.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
('macos-14-arm64', None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
3131
('macos-14', None, ['Debug', 'Release'], ['shared', 'static'], [11, 17]),
3232

33-
('windows-64-vs2015', 'vs2015x64', ['Debug', 'Release'], ['shared', 'static'], [11, ]), # CXX-3215
3433
('windows-vsCurrent', 'vs2017x64', ['Debug', 'Release'], ['shared', 'static'], [11, 17, ]),
3534
('windows-vsCurrent', 'vs2019x64', ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, ]),
3635
('windows-vsCurrent', 'vs2022x64', ['Debug', 'Release'], ['shared', 'static'], [11, 17, 20, 23]),
@@ -76,10 +75,7 @@ def tasks():
7675
commands += [
7776
Setup.call(),
7877
InstallCDriver.call(),
79-
] + (
80-
# DEVPROD-13875 + astral-sh/uv/issues/10231.
81-
[] if "vs2015" in distro_name else [InstallUV.call()]
82-
) + [
78+
InstallUV.call(),
8379
Compile.call(
8480
build_type=build_type,
8581
compiler=compiler,

.evergreen/config_generator/etc/distros.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ def ls_distro(name, **kwargs):
8787
]
8888

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

@@ -158,10 +157,6 @@ def make_distro_str(distro_name, compiler, arch) -> str:
158157
# ('windows-64-vs2017', 'vs2017x64', None) -> vs2017-x64
159158
# ('windows-64-vs2017', 'mingw', None) -> vs2017-mingw
160159
distro_str = distro_name[len('windows-64-'):] + {
161-
'vs2013x64': '-x64',
162-
'vs2013x86': '-x86',
163-
'vs2015x64': '-x64',
164-
'vs2015x86': '-x86',
165160
'vs2017x64': '-x64',
166161
'vs2017x86': '-x86',
167162
'vs2019x64': '-x64',
@@ -182,10 +177,6 @@ def make_distro_str(distro_name, compiler, arch) -> str:
182177

183178
def to_cc(compiler):
184179
return {
185-
'vs2013x64': 'Visual Studio 12 2013',
186-
'vs2013x86': 'Visual Studio 12 2013',
187-
'vs2015x64': 'Visual Studio 14 2015',
188-
'vs2015x86': 'Visual Studio 14 2015',
189180
'vs2017x64': 'Visual Studio 15 2017',
190181
'vs2017x86': 'Visual Studio 15 2017',
191182
'vs2019x64': 'Visual Studio 16 2019',
@@ -197,10 +188,6 @@ def to_cc(compiler):
197188

198189
def to_platform(compiler):
199190
return {
200-
'vs2013x64': 'x64',
201-
'vs2013x86': 'Win32',
202-
'vs2015x64': 'x64',
203-
'vs2015x86': 'Win32',
204191
'vs2017x64': 'x64',
205192
'vs2017x86': 'Win32',
206193
'vs2019x64': 'x64',

.evergreen/generated_configs/tasks.yml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,74 +1782,6 @@ tasks:
17821782
build_type: Release
17831783
cc_compiler: gcc
17841784
cxx_compiler: g++
1785-
- name: compile-only-vs2015-x64-cxx11-debug-shared
1786-
run_on: windows-64-vs2015-large
1787-
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, debug, shared]
1788-
commands:
1789-
- command: expansions.update
1790-
params:
1791-
updates:
1792-
- { key: build_type, value: Debug }
1793-
- { key: generator, value: Visual Studio 14 2015 }
1794-
- { key: platform, value: x64 }
1795-
- func: setup
1796-
- func: install_c_driver
1797-
- func: compile
1798-
vars:
1799-
build_type: Debug
1800-
generator: Visual Studio 14 2015
1801-
platform: x64
1802-
- name: compile-only-vs2015-x64-cxx11-debug-static
1803-
run_on: windows-64-vs2015-large
1804-
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, debug, static]
1805-
commands:
1806-
- command: expansions.update
1807-
params:
1808-
updates:
1809-
- { key: build_type, value: Debug }
1810-
- { key: generator, value: Visual Studio 14 2015 }
1811-
- { key: platform, value: x64 }
1812-
- func: setup
1813-
- func: install_c_driver
1814-
- func: compile
1815-
vars:
1816-
build_type: Debug
1817-
generator: Visual Studio 14 2015
1818-
platform: x64
1819-
- name: compile-only-vs2015-x64-cxx11-release-shared
1820-
run_on: windows-64-vs2015-large
1821-
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, release, shared]
1822-
commands:
1823-
- command: expansions.update
1824-
params:
1825-
updates:
1826-
- { key: build_type, value: Release }
1827-
- { key: generator, value: Visual Studio 14 2015 }
1828-
- { key: platform, value: x64 }
1829-
- func: setup
1830-
- func: install_c_driver
1831-
- func: compile
1832-
vars:
1833-
build_type: Release
1834-
generator: Visual Studio 14 2015
1835-
platform: x64
1836-
- name: compile-only-vs2015-x64-cxx11-release-static
1837-
run_on: windows-64-vs2015-large
1838-
tags: [compile-only, windows-64-vs2015, cxx11, vs2015x64, release, static]
1839-
commands:
1840-
- command: expansions.update
1841-
params:
1842-
updates:
1843-
- { key: build_type, value: Release }
1844-
- { key: generator, value: Visual Studio 14 2015 }
1845-
- { key: platform, value: x64 }
1846-
- func: setup
1847-
- func: install_c_driver
1848-
- func: compile
1849-
vars:
1850-
build_type: Release
1851-
generator: Visual Studio 14 2015
1852-
platform: x64
18531785
- name: compile-only-windows-2019-vs2017-x64-cxx11-debug-shared
18541786
run_on: windows-vsCurrent-large
18551787
tags: [compile-only, windows-vsCurrent, cxx11, vs2017x64, debug, shared]

.evergreen/scripts/compile.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ set -o pipefail
2727
: "${USE_SANITIZER_ASAN:-}"
2828
: "${USE_SANITIZER_UBSAN:-}"
2929
: "${USE_STATIC_LIBS:-}"
30-
: "${UV_INSTALL_DIR:-}" # Not on windows-64-vs2015.
3130

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

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

9587
cmake_flags=(

0 commit comments

Comments
 (0)