diff options
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | etc/evergreen.yml | 24 |
2 files changed, 12 insertions, 20 deletions
diff --git a/SConstruct b/SConstruct index 9fd6e0b6db7..c5113604c86 100644 --- a/SConstruct +++ b/SConstruct @@ -950,8 +950,8 @@ env_vars.Add('MSVC_USE_SCRIPT', help='Sets the script used to setup Visual Studio.') env_vars.Add('MSVC_VERSION', - help='Sets the version of Visual C++ to use (e.g. 14.1 for VS2017, 14.2 for VS2019)', - default="14.2") + help='Sets the version of Visual C++ to use (e.g. 14.2 for VS2019, 14.3 for VS2022)', + default="14.3") env_vars.Add('NINJA_PREFIX', default="build", @@ -2617,14 +2617,14 @@ def doConfigure(myenv): # bare compilers, and we should re-check at the very end that TryCompile and TryLink still # work with the flags we have selected. if myenv.ToolchainIs('msvc'): - compiler_minimum_string = "Microsoft Visual Studio 2019 16.4" + compiler_minimum_string = "Microsoft Visual Studio 2022 17.0" compiler_test_body = textwrap.dedent( """ #if !defined(_MSC_VER) #error #endif - #if _MSC_VER < 1924 + #if _MSC_VER < 1930 #error %s or newer is required to build MongoDB #endif diff --git a/etc/evergreen.yml b/etc/evergreen.yml index bd08c079b57..0c7c0cf1de4 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -8871,19 +8871,18 @@ buildvariants: distros: - rhel70-small -- &enterprise-windows-msvs2022-experimental-template - name: enterprise-windows-msvs2022-experimental - display_name: "~ Enterprise Windows MSVS 2022" +- name: enterprise-windows-cxx20-debug-experimental + display_name: "~ Enterprise Windows C++20 DEBUG" cron: "0 12 * * *" # Every day starting at 12:00 modules: - enterprise run_on: - - windows-vsCurrent-2022-small - expansions: &enterprise-windows-msvs2022-experimental-expansions-template + - windows-vsCurrent-small + expansions: exe: ".exe" additional_package_targets: archive-mongocryptd archive-mongocryptd-debug msi archive-mh archive-mh-debug content_type: application/zip - compile_flags: --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10 MSVC_VERSION=14.3 + compile_flags: --dbg=on --opt=on --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10 --cxx-std=20 num_scons_link_jobs_available: 0.25 python: '/cygdrive/c/python/python37/python.exe' ext: zip @@ -8891,13 +8890,13 @@ buildvariants: jstestfuzz_num_generated_files: 35 target_resmoke_time: 20 max_sub_suites: 3 - large_distro_name: windows-vsCurrent-2022-large + large_distro_name: windows-vsCurrent-large test_flags: *windows_common_test_excludes exec_timeout_secs: 14400 # 3 hour timeout tasks: - name: compile_test_and_package_serial_TG distros: - - windows-vsCurrent-2022-large + - windows-vsCurrent-large - name: build_variant_gen # - name: .aggfuzzer # Disabled for FCV 5.3 - name: .aggregation !.auth !.encrypt !.unwind @@ -8908,7 +8907,7 @@ buildvariants: # with more RAM for these suites. - name: .concurrency !.ubsan !.no_txns !.kill_terminate !.common !.debug_only distros: - - windows-vsCurrent-2022-large + - windows-vsCurrent-large - name: .concurrency .common - name: disk_wiredtiger - name: .jscore .common !.auth @@ -8926,13 +8925,6 @@ buildvariants: - name: .stitch - name: .updatefuzzer !.multiversion -- <<: *enterprise-windows-msvs2022-experimental-template - name: enterprise-windows-msvs2022-cxx20-debug-experimental - display_name: "~ Enterprise Windows MSVS 2022 C++20 DEBUG" - expansions: - <<: *enterprise-windows-msvs2022-experimental-expansions-template - compile_flags: --dbg=on --opt=on --ssl MONGO_DISTMOD=windows CPPPATH="c:/sasl/include c:/snmp/include" LIBPATH="c:/sasl/lib c:/snmp/lib" -j$(bc <<< "$(grep -c '^processor' /proc/cpuinfo) / 1.5") --win-version-min=win10 MSVC_VERSION=14.3 --cxx-std=20 - - name: enterprise-windows-debug-unoptimized display_name: Enterprise Windows DEBUG (Unoptimized) cron: "0 12 * * *" # Every day starting at 12:00 |