diff --git a/.evergreen/config_generator/components/c_std_compile.py b/.evergreen/config_generator/components/c_std_compile.py index e83fafd98a8..de11c211dc2 100644 --- a/.evergreen/config_generator/components/c_std_compile.py +++ b/.evergreen/config_generator/components/c_std_compile.py @@ -17,7 +17,6 @@ # fmt: off MATRIX = [ ('archlinux', 'clang', None, [11, ]), - ('debian81', 'clang', None, [11, ]), ('debian92', 'clang', None, [11, ]), ('ubuntu1604', 'clang', 'i686', [11, ]), ('ubuntu1604', 'clang', None, [11, ]), diff --git a/.evergreen/config_generator/components/sasl/darwinssl.py b/.evergreen/config_generator/components/sasl/darwinssl.py index 89ca4a59cc2..791388a00e4 100644 --- a/.evergreen/config_generator/components/sasl/darwinssl.py +++ b/.evergreen/config_generator/components/sasl/darwinssl.py @@ -15,8 +15,6 @@ # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('macos-1014', 'clang', None, ['cyrus']), - ('macos-1015', 'clang', None, ['cyrus']), ('macos-1100', 'clang', None, ['cyrus']), ('macos-1100-arm64', 'clang', None, ['cyrus']), ] @@ -53,11 +51,6 @@ def tasks(): res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX) res += generate_test_tasks(SSL, TAG, TEST_MATRIX) - # TODO: remove once MONGOCRYPT-443 is resolved. - for task in res: - if task.run_on == 'macos-1015': - task.disable = True - return res diff --git a/.evergreen/config_generator/components/sasl/nossl.py b/.evergreen/config_generator/components/sasl/nossl.py index 8a23aad7b53..8be889765e0 100644 --- a/.evergreen/config_generator/components/sasl/nossl.py +++ b/.evergreen/config_generator/components/sasl/nossl.py @@ -15,7 +15,6 @@ # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('macos-1014', 'clang', None, ['off']), ('ubuntu1604', 'gcc', None, ['off']), ('ubuntu1804', 'gcc', None, ['off']), ('ubuntu2004', 'gcc', None, ['off']), diff --git a/.evergreen/config_generator/components/sasl/openssl.py b/.evergreen/config_generator/components/sasl/openssl.py index 81873938ad6..f1b7a6c3d14 100644 --- a/.evergreen/config_generator/components/sasl/openssl.py +++ b/.evergreen/config_generator/components/sasl/openssl.py @@ -19,16 +19,12 @@ ('archlinux', 'gcc', None, ['cyrus']), ('debian10', 'gcc', None, ['cyrus']), ('debian11', 'gcc', None, ['cyrus']), - ('debian81', 'clang', None, ['cyrus']), - ('debian81', 'gcc', None, ['cyrus']), ('debian92', 'clang', None, ['cyrus']), ('debian92', 'gcc', None, ['cyrus']), ('rhel70', 'gcc', None, ['cyrus']), ('rhel80', 'gcc', None, ['cyrus']), ('rhel81-power8', 'gcc', None, ['cyrus']), ('rhel83-zseries', 'gcc', None, ['cyrus']), - ('ubuntu1404', 'clang', None, ['cyrus']), - ('ubuntu1404', 'gcc', None, ['cyrus']), ('ubuntu1604-arm64', 'gcc', None, ['cyrus']), ('ubuntu1604', 'clang', None, ['cyrus']), ('ubuntu1804-arm64', 'gcc', None, ['cyrus']), diff --git a/.evergreen/config_generator/components/scan_build.py b/.evergreen/config_generator/components/scan_build.py index 119bab817eb..7280a48cc7d 100644 --- a/.evergreen/config_generator/components/scan_build.py +++ b/.evergreen/config_generator/components/scan_build.py @@ -80,11 +80,6 @@ def tasks(): ) ) - # TODO: remove once BUILD-16814 is resolved. - for task in res: - if task.run_on == 'macos-1014': - task.disable = True - return res diff --git a/.evergreen/config_generator/etc/distros.py b/.evergreen/config_generator/etc/distros.py index c71e95e46d9..a1f67089760 100644 --- a/.evergreen/config_generator/etc/distros.py +++ b/.evergreen/config_generator/etc/distros.py @@ -54,16 +54,11 @@ def validate_os_ver(cls, value): Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'), Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'), Distro(name='debian11-small', os='debian', os_type='linux', os_ver='11', size='small'), - Distro(name='debian81-large', os='debian', os_type='linux', os_ver='8.1', size='large'), - Distro(name='debian81-small', os='debian', os_type='linux', os_ver='8.1', size='small'), Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'), ] MACOS_DISTROS = [ - Distro(name='macos-1012', os='macos', os_type='macos', os_ver='10.12'), - Distro(name='macos-1014', os='macos', os_type='macos', os_ver='10.14'), - Distro(name='macos-1015', os='macos', os_type='macos', os_ver='10.15'), Distro(name='macos-1100', os='macos', os_type='macos', os_ver='11.00'), ] @@ -110,8 +105,6 @@ def validate_os_ver(cls, value): ] UBUNTU_DISTROS = [ - Distro(name='ubuntu1404-large', os='ubuntu', os_type='linux', os_ver='14.04', size='large'), - Distro(name='ubuntu1404-small', os='ubuntu', os_type='linux', os_ver='14.04', size='small'), Distro(name='ubuntu1604-large', os='ubuntu', os_type='linux', os_ver='16.04', size='large'), Distro(name='ubuntu1604-small', os='ubuntu', os_type='linux', os_ver='16.04', size='small'), Distro(name='ubuntu1804-large', os='ubuntu', os_type='linux', os_ver='18.04', size='large'), diff --git a/.evergreen/generated_configs/legacy-config.yml b/.evergreen/generated_configs/legacy-config.yml index fa778df5b4f..47b0497b625 100644 --- a/.evergreen/generated_configs/legacy-config.yml +++ b/.evergreen/generated_configs/legacy-config.yml @@ -14010,10 +14010,10 @@ buildvariants: - link-with-cmake-snappy-deprecated - name: link-with-cmake-mac distros: - - macos-1014 + - macos-1100 - name: link-with-cmake-mac-deprecated distros: - - macos-1014 + - macos-1100 - name: link-with-cmake-windows distros: - windows-vsCurrent-large @@ -14031,7 +14031,7 @@ buildvariants: - ubuntu1804-test - name: link-with-pkg-config-mac distros: - - macos-1014 + - macos-1100 - link-with-pkg-config-ssl - link-with-bson - name: link-with-bson-windows @@ -14039,7 +14039,7 @@ buildvariants: - windows-vsCurrent-large - name: link-with-bson-mac distros: - - macos-1014 + - macos-1100 - name: link-with-bson-mingw distros: - windows-vsCurrent-large @@ -14058,24 +14058,6 @@ buildvariants: - install-libmongoc-after-libbson tags: - pr-merge-gate -- name: clang34ubuntu - display_name: clang 3.4 (Ubuntu 14.04) - expansions: - CC: clang - run_on: ubuntu1404-build - tasks: - - release-compile - - debug-compile-rdtscp -- name: clang35 - display_name: clang 3.5 (Debian 8.1) - expansions: - CC: clang - run_on: debian81-test - tasks: - - release-compile - - debug-compile-sasl-openssl - - debug-compile-nosasl-openssl - - .authentication-tests .openssl - name: clang38 display_name: clang 3.8 (Debian 9.2) expansions: @@ -14139,13 +14121,6 @@ buildvariants: - debug-compile-nosasl-openssl - debug-compile-no-align - .authentication-tests .openssl -- name: gcc48ubuntu - display_name: GCC 4.8 (Ubuntu 14.04) - expansions: - CC: gcc - run_on: ubuntu1404-build - tasks: - - release-compile - name: gcc82rhel display_name: GCC 8.2 (RHEL 8.0) expansions: @@ -14174,16 +14149,6 @@ buildvariants: - debug-compile-nosasl-openssl - .authentication-tests .openssl - .latest .nossl -- name: gcc49 - display_name: GCC 4.9 (Debian 8.1) - expansions: - CC: gcc - run_on: debian81-test - tasks: - - release-compile - - debug-compile-sasl-openssl - - debug-compile-nosasl-openssl - - .authentication-tests .openssl - name: gcc63 display_name: GCC 6.3 (Debian 9.2) expansions: @@ -14266,7 +14231,7 @@ buildvariants: display_name: '*Darwin, macOS (Apple LLVM)' expansions: CC: clang - run_on: macos-1014 + run_on: macos-1100 tasks: - .compression !.snappy - release-compile @@ -14462,14 +14427,14 @@ buildvariants: - name: debug-compile-nosasl-openssl-static - name: debug-compile-nosasl-darwinssl distros: - - macos-1014 + - macos-1100 - name: debug-compile-nosasl-winssl distros: - windows-vsCurrent-large - name: .ocsp-openssl - name: .ocsp-darwinssl distros: - - macos-1014 + - macos-1100 - name: .ocsp-winssl distros: - windows-vsCurrent-large diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml index 644aeee7cb6..e8724eb7963 100644 --- a/.evergreen/generated_configs/tasks.yml +++ b/.evergreen/generated_configs/tasks.yml @@ -2535,23 +2535,6 @@ tasks: - func: openssl-static-compile vars: CC: gcc - - name: sasl-cyrus-darwinssl-macos-1014-clang-compile - run_on: macos-1014 - tags: [sasl-matrix-darwinssl, compile, macos-1014, clang, sasl-cyrus] - commands: - - func: sasl-cyrus-darwinssl-compile - vars: - CC: clang - - func: upload-build - - name: sasl-cyrus-darwinssl-macos-1015-clang-compile - run_on: macos-1015 - tags: [sasl-matrix-darwinssl, compile, macos-1015, clang, sasl-cyrus] - disable: true - commands: - - func: sasl-cyrus-darwinssl-compile - vars: - CC: clang - - func: upload-build - name: sasl-cyrus-darwinssl-macos-1100-arm64-clang-compile run_on: macos-1100-arm64 tags: [sasl-matrix-darwinssl, compile, macos-1100-arm64, clang, sasl-cyrus] @@ -2760,22 +2743,6 @@ tasks: vars: CC: gcc - func: upload-build - - name: sasl-cyrus-openssl-debian81-clang-compile - run_on: debian81-large - tags: [sasl-matrix-openssl, compile, debian81, clang, sasl-cyrus] - commands: - - func: sasl-cyrus-openssl-compile - vars: - CC: clang - - func: upload-build - - name: sasl-cyrus-openssl-debian81-gcc-compile - run_on: debian81-large - tags: [sasl-matrix-openssl, compile, debian81, gcc, sasl-cyrus] - commands: - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - name: sasl-cyrus-openssl-debian92-clang-compile run_on: debian92-large tags: [sasl-matrix-openssl, compile, debian92, clang, sasl-cyrus] @@ -3024,22 +2991,6 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-openssl-ubuntu1404-clang-compile - run_on: ubuntu1404-large - tags: [sasl-matrix-openssl, compile, ubuntu1404, clang, sasl-cyrus] - commands: - - func: sasl-cyrus-openssl-compile - vars: - CC: clang - - func: upload-build - - name: sasl-cyrus-openssl-ubuntu1404-gcc-compile - run_on: ubuntu1404-large - tags: [sasl-matrix-openssl, compile, ubuntu1404, gcc, sasl-cyrus] - commands: - - func: sasl-cyrus-openssl-compile - vars: - CC: gcc - - func: upload-build - name: sasl-cyrus-openssl-ubuntu1604-arm64-gcc-compile run_on: ubuntu1604-arm64-large tags: [sasl-matrix-openssl, compile, ubuntu1604-arm64, gcc, sasl-cyrus] @@ -3680,14 +3631,6 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-off-nossl-macos-1014-clang-compile - run_on: macos-1014 - tags: [sasl-matrix-nossl, compile, macos-1014, clang, sasl-off] - commands: - - func: sasl-off-nossl-compile - vars: - CC: clang - - func: upload-build - name: sasl-off-nossl-ubuntu1604-gcc-compile run_on: ubuntu1604-large tags: [sasl-matrix-nossl, compile, ubuntu1604, gcc, sasl-off] @@ -4406,14 +4349,6 @@ tasks: vars: CC: gcc C_STD_VERSION: 11 - - name: std-c11-debian81-clang-compile - run_on: debian81-large - tags: [std-matrix, debian81, clang, compile, std-c11] - commands: - - func: std-compile - vars: - CC: clang - C_STD_VERSION: 11 - name: std-c11-debian92-clang-compile run_on: debian92-large tags: [std-matrix, debian92, clang, compile, std-c11] diff --git a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py index a4d8e5c0459..2d983a967db 100644 --- a/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py +++ b/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py @@ -53,18 +53,18 @@ def days(n: int) -> int: "link-with-cmake-ssl-deprecated", "link-with-cmake-snappy", "link-with-cmake-snappy-deprecated", - OD([("name", "link-with-cmake-mac"), ("distros", ["macos-1014"])]), - OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-1014"])]), + OD([("name", "link-with-cmake-mac"), ("distros", ["macos-1100"])]), + OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-1100"])]), OD([("name", "link-with-cmake-windows"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-windows-ssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-windows-snappy"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-cmake-mingw"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "link-with-pkg-config"), ("distros", ["ubuntu1804-test"])]), - OD([("name", "link-with-pkg-config-mac"), ("distros", ["macos-1014"])]), + OD([("name", "link-with-pkg-config-mac"), ("distros", ["macos-1100"])]), "link-with-pkg-config-ssl", "link-with-bson", OD([("name", "link-with-bson-windows"), ("distros", ["windows-vsCurrent-large"])]), - OD([("name", "link-with-bson-mac"), ("distros", ["macos-1014"])]), + OD([("name", "link-with-bson-mac"), ("distros", ["macos-1100"])]), OD([("name", "link-with-bson-mingw"), ("distros", ["windows-vsCurrent-large"])]), "check-headers", "install-uninstall-check", @@ -80,25 +80,6 @@ def days(n: int) -> int: }, tags=["pr-merge-gate"], ), - Variant( - "clang34ubuntu", - "clang 3.4 (Ubuntu 14.04)", - "ubuntu1404-build", - ["release-compile", "debug-compile-rdtscp"], - {"CC": "clang"}, - ), - Variant( - "clang35", - "clang 3.5 (Debian 8.1)", - "debian81-test", - [ - "release-compile", - "debug-compile-sasl-openssl", - "debug-compile-nosasl-openssl", - ".authentication-tests .openssl", - ], - {"CC": "clang"}, - ), Variant( "clang38", "clang 3.8 (Debian 9.2)", @@ -167,7 +148,6 @@ def days(n: int) -> int: ], {"CC": "clang"}, ), - Variant("gcc48ubuntu", "GCC 4.8 (Ubuntu 14.04)", "ubuntu1404-build", ["release-compile"], {"CC": "gcc"}), Variant( "gcc82rhel", "GCC 8.2 (RHEL 8.0)", @@ -202,18 +182,6 @@ def days(n: int) -> int: ], {"CC": "gcc"}, ), - Variant( - "gcc49", - "GCC 4.9 (Debian 8.1)", - "debian81-test", - [ - "release-compile", - "debug-compile-sasl-openssl", - "debug-compile-nosasl-openssl", - ".authentication-tests .openssl", - ], - {"CC": "gcc"}, - ), Variant( "gcc63", "GCC 6.3 (Debian 9.2)", @@ -282,7 +250,7 @@ def days(n: int) -> int: Variant( "darwin", "*Darwin, macOS (Apple LLVM)", - "macos-1014", + "macos-1100", [ ".compression !.snappy", "release-compile", @@ -486,10 +454,10 @@ def days(n: int) -> int: [ OD([("name", "debug-compile-nosasl-openssl")]), OD([("name", "debug-compile-nosasl-openssl-static")]), - OD([("name", "debug-compile-nosasl-darwinssl"), ("distros", ["macos-1014"])]), + OD([("name", "debug-compile-nosasl-darwinssl"), ("distros", ["macos-1100"])]), OD([("name", "debug-compile-nosasl-winssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", ".ocsp-openssl")]), - OD([("name", ".ocsp-darwinssl"), ("distros", ["macos-1014"])]), + OD([("name", ".ocsp-darwinssl"), ("distros", ["macos-1100"])]), OD([("name", ".ocsp-winssl"), ("distros", ["windows-vsCurrent-large"])]), OD([("name", "debug-compile-nosasl-openssl-1.0.1")]), OD([("name", ".ocsp-openssl-1.0.1")]), diff --git a/.evergreen/scripts/run-auth-tests.sh b/.evergreen/scripts/run-auth-tests.sh index 8fec9ffc19e..dbae8ed6860 100644 --- a/.evergreen/scripts/run-auth-tests.sh +++ b/.evergreen/scripts/run-auth-tests.sh @@ -100,8 +100,9 @@ elif command -v otool >/dev/null; then fi if [[ "${ssl}" != "OFF" ]]; then - # FIXME: CDRIVER-2008 - if [[ "${OSTYPE}" != "cygwin" ]]; then + # FIXME: CDRIVER-2008 for the cygwin check + # FIXME: BUILD-18145/CDRIVER-4746 for the darwin check + if [[ "${OSTYPE}" != "cygwin" && ! ( "${OSTYPE}" =~ "darwin" ) ]]; then echo "Authenticating using X.509" LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US@${auth_host}/?ssl=true&authMechanism=MONGODB-X509&sslClientCertificateKeyFile=src/libmongoc/tests/x509gen/legacy-x509.pem&sslCertificateAuthorityFile=src/libmongoc/tests/x509gen/legacy-ca.crt&sslAllowInvalidHostnames=true&${c_timeout}" fi diff --git a/NEWS b/NEWS index f41f9653245..9f9dcc1a63b 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,12 @@ Improvements: * Remove optional dependency of libicu. +Platform Support: + + * Support for macOS 10.14 is dropped. + * Support for Ubuntu 14.04 is dropped. + * Support for Debian 8.1 is dropped. + Other: * The constructed source-distribution archive is no longer available as a diff --git a/src/libbson/NEWS b/src/libbson/NEWS index cb5a81f3d6b..33c70885c6f 100644 --- a/src/libbson/NEWS +++ b/src/libbson/NEWS @@ -4,6 +4,12 @@ libbson 1.24.4 Fixes: * Fix libmongoc build failure caused by missing install of `bson-dsl.h`. +Platform Support: + + * Support for macOS 10.14 is dropped. + * Support for Ubuntu 14.04 is dropped. + * Support for Debian 8.1 is dropped. + Thanks to everyone who contributed to the development of this release. * Kevin Albertson diff --git a/src/libmongoc/doc/ref/platforms.rst b/src/libmongoc/doc/ref/platforms.rst index bbaeab54c4f..4a54fa7ea0f 100644 --- a/src/libmongoc/doc/ref/platforms.rst +++ b/src/libmongoc/doc/ref/platforms.rst @@ -30,7 +30,7 @@ The following operating systems are continually tested with |mongo-c-driver|: - - Arch Linux - - - macOS - - Versions **10.14** and **11.0** + - Version **11.0** - - Windows Server 2008 and Windows Server 2016 - Windows variants of the same generation are supported @@ -47,10 +47,10 @@ The following compilers are continually tested for |mongo-c-driver|: - - Compiler - Notes - - Clang - - Versions **3.4**, **3.5**, **3.7**, **3.8**, and **6.0**. Newer versions + - Versions **3.7**, **3.8**, and **6.0**. Newer versions are also supported, as well as the corresponding Apple Clang releases. - - GCC - - Versions **4.8**, **4.9**, **5.4**, **6.3**, **7.5**, **8.2**, **8.3**, + - Versions **4.8**, **5.4**, **6.3**, **7.5**, **8.2**, **8.3**, **9.4**, and **10.2**. The MinGW-w64 GCC is also tested and supported. - - Microsoft Visual C++ (MSVC) - Tested with MSVC **12.x** (Visual Studio **2013**), **14.x** (Visual