diff --git a/.evergreen/compile-unix.sh b/.evergreen/compile-unix.sh index 353cecbfb..0a0a057a9 100755 --- a/.evergreen/compile-unix.sh +++ b/.evergreen/compile-unix.sh @@ -65,19 +65,18 @@ esac # Report the current PHP version echo "PHP: `php --version | head -n 1`" -# If we're testing a specific version of libmongoc, update submodule sources +# If we're testing a specific version of libmongoc, update submodule sources and version if [ -n "$LIBMONGOC_VERSION" ]; then + echo "Finding Python3 binary..." + PYTHON="$(bash -c ". $DRIVERS_TOOLS/.evergreen/find-python3.sh && find_python3 2>/dev/null")" + echo "Finding Python3 binary... done." + php scripts/update-submodule-sources.php + # We invoke python manually as it may not be in the path + $PYTHON src/libmongoc/build/calc_release_version.py > src/LIBMONGOC_VERSION_CURRENT fi phpize ./configure --enable-mongodb-developer-flags -# configure relies on version information in libmongoc-version-current, but the target is not available until after calling configure -# To work around this, run the make target, then run configure again -if [ -n "$LIBMONGOC_VERSION" ]; then - make libmongoc-version-current - ./configure --enable-mongodb-developer-flags -fi - make test TESTS="tests/smoketest.phpt" diff --git a/.evergreen/config.yml b/.evergreen/config.yml index bc95993f5..2ee5e5e33 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -75,6 +75,7 @@ include: - filename: .evergreen/config/generated/build/build-libmongoc-8.3.yml - filename: .evergreen/config/generated/test/local-latest.yml - filename: .evergreen/config/generated/test/local-rapid.yml + - filename: .evergreen/config/generated/test/local-8.0.yml - filename: .evergreen/config/generated/test/local-7.0.yml - filename: .evergreen/config/generated/test/local-6.0.yml - filename: .evergreen/config/generated/test/local-5.0.yml @@ -84,22 +85,26 @@ include: - filename: .evergreen/config/generated/test/local-3.6.yml - filename: .evergreen/config/generated/test/load-balanced-latest.yml - filename: .evergreen/config/generated/test/load-balanced-rapid.yml + - filename: .evergreen/config/generated/test/load-balanced-8.0.yml - filename: .evergreen/config/generated/test/load-balanced-7.0.yml - filename: .evergreen/config/generated/test/load-balanced-6.0.yml - filename: .evergreen/config/generated/test/load-balanced-5.0.yml - filename: .evergreen/config/generated/test/ocsp-latest.yml - filename: .evergreen/config/generated/test/ocsp-rapid.yml + - filename: .evergreen/config/generated/test/ocsp-8.0.yml - filename: .evergreen/config/generated/test/ocsp-7.0.yml - filename: .evergreen/config/generated/test/ocsp-6.0.yml - filename: .evergreen/config/generated/test/ocsp-5.0.yml - filename: .evergreen/config/generated/test/ocsp-4.4.yml - filename: .evergreen/config/generated/test/require-api-version-latest.yml - filename: .evergreen/config/generated/test/require-api-version-rapid.yml + - filename: .evergreen/config/generated/test/require-api-version-8.0.yml - filename: .evergreen/config/generated/test/require-api-version-7.0.yml - filename: .evergreen/config/generated/test/require-api-version-6.0.yml - filename: .evergreen/config/generated/test/require-api-version-5.0.yml - filename: .evergreen/config/generated/test/skip-crypt-shared-latest.yml - filename: .evergreen/config/generated/test/skip-crypt-shared-rapid.yml + - filename: .evergreen/config/generated/test/skip-crypt-shared-8.0.yml - filename: .evergreen/config/generated/test/skip-crypt-shared-7.0.yml - filename: .evergreen/config/generated/test/skip-crypt-shared-6.0.yml - filename: .evergreen/config/generated/test-variant/full-php-8.3.yml diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index fb0e81113..d6ac2e051 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -3,13 +3,19 @@ # buildvariants: # Debian + - name: build-debian12 + display_name: "Build: Debian 12" + tags: ["build", "debian", "x64", "pr", "tag"] + run_on: debian12-small + tasks: + - name: "build-php-openssl3" + - name: "build-php-libmongoc" - name: build-debian11 display_name: "Build: Debian 11" tags: ["build", "debian", "x64", "pr", "tag"] run_on: debian11-small tasks: - name: "build-all-php" - - name: "build-php-libmongoc" - name: build-debian10 display_name: "Build: Debian 10" tags: ["build", "debian", "x64", "pr", "tag"] diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index c595bc3b1..3df29e939 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -2,18 +2,22 @@ = 5.0, < 8.0 - name: test-debian11-php-7.4 tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] display_name: "Test: Debian 11, PHP 7.4" @@ -11,12 +13,13 @@ buildvariants: - variant: "build-debian11" name: "build-php-7.4" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".ocsp !.4.4 !.8.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -30,7 +33,11 @@ buildvariants: - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-7.4 tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] display_name: "Test: Debian 9.2, PHP 7.4" @@ -43,15 +50,12 @@ buildvariants: name: "build-php-7.4" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/full-php-8.0.yml b/.evergreen/config/generated/test-variant/full-php-8.0.yml index aa814cd72..e3cad5a48 100644 --- a/.evergreen/config/generated/test-variant/full-php-8.0.yml +++ b/.evergreen/config/generated/test-variant/full-php-8.0.yml @@ -1,5 +1,7 @@ -# This file is generated automatically - please edit the "templates/test-variant/full.yml" template file instead. +# This file is generated automatically - please edit the "templates/test-variant/legacy-php-full.yml" template file instead. +# TODO PHPC-2343: This file can be removed when requiring PHP 8.1+ buildvariants: + # Test MongoDB >= 5.0, < 8.0 - name: test-debian11-php-8.0 tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] display_name: "Test: Debian 11, PHP 8.0" @@ -11,12 +13,13 @@ buildvariants: - variant: "build-debian11" name: "build-php-8.0" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".ocsp !.4.4 !.8.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -30,7 +33,11 @@ buildvariants: - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-8.0 tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] display_name: "Test: Debian 9.2, PHP 8.0" @@ -43,15 +50,12 @@ buildvariants: name: "build-php-8.0" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/full-php-8.1.yml b/.evergreen/config/generated/test-variant/full-php-8.1.yml index fb8353be0..aa0fb003e 100644 --- a/.evergreen/config/generated/test-variant/full-php-8.1.yml +++ b/.evergreen/config/generated/test-variant/full-php-8.1.yml @@ -1,22 +1,23 @@ -# This file is generated automatically - please edit the "templates/test-variant/full.yml" template file instead. +# This file is generated automatically - please edit the "templates/test-variant/modern-php-full.yml" template file instead. buildvariants: - - name: test-debian11-php-8.1 + # Test MongoDB >= 7.0 + - name: test-debian12-php-8.1 tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] - display_name: "Test: Debian 11, PHP 8.1" - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.1" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.1" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.1" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -24,13 +25,40 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-8.1 + tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.1" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.1" + depends_on: + - variant: "build-debian11" + name: "build-php-8.1" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-8.1 tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] display_name: "Test: Debian 9.2, PHP 8.1" @@ -43,15 +71,12 @@ buildvariants: name: "build-php-8.1" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/full-php-8.2.yml b/.evergreen/config/generated/test-variant/full-php-8.2.yml index 56519d7f7..4ccaf90dd 100644 --- a/.evergreen/config/generated/test-variant/full-php-8.2.yml +++ b/.evergreen/config/generated/test-variant/full-php-8.2.yml @@ -1,22 +1,23 @@ -# This file is generated automatically - please edit the "templates/test-variant/full.yml" template file instead. +# This file is generated automatically - please edit the "templates/test-variant/modern-php-full.yml" template file instead. buildvariants: - - name: test-debian11-php-8.2 + # Test MongoDB >= 7.0 + - name: test-debian12-php-8.2 tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] - display_name: "Test: Debian 11, PHP 8.2" - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.2" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.2" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.2" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -24,13 +25,40 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-8.2 + tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.2" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian11" + name: "build-php-8.2" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-8.2 tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] display_name: "Test: Debian 9.2, PHP 8.2" @@ -43,15 +71,12 @@ buildvariants: name: "build-php-8.2" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/full-php-8.3.yml b/.evergreen/config/generated/test-variant/full-php-8.3.yml index e08673600..5d364ca6d 100644 --- a/.evergreen/config/generated/test-variant/full-php-8.3.yml +++ b/.evergreen/config/generated/test-variant/full-php-8.3.yml @@ -1,22 +1,23 @@ -# This file is generated automatically - please edit the "templates/test-variant/full.yml" template file instead. +# This file is generated automatically - please edit the "templates/test-variant/modern-php-full.yml" template file instead. buildvariants: - - name: test-debian11-php-8.3 + # Test MongoDB >= 7.0 + - name: test-debian12-php-8.3 tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: Debian 11, PHP 8.3" - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -24,13 +25,40 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-8.3 + tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.3" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.3" + depends_on: + - variant: "build-debian11" + name: "build-php-8.3" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-8.3 tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] display_name: "Test: Debian 9.2, PHP 8.3" @@ -43,15 +71,12 @@ buildvariants: name: "build-php-8.3" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/latest-php-8.3.yml b/.evergreen/config/generated/test-variant/latest-php-8.3.yml deleted file mode 100644 index 58747e2bc..000000000 --- a/.evergreen/config/generated/test-variant/latest-php-8.3.yml +++ /dev/null @@ -1,57 +0,0 @@ -# This file is generated automatically - please edit the "templates/test-variant/latest.yml" template file instead. -buildvariants: - - name: test-debian11-php-8.3 - tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: Debian 11, PHP 8.3" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-8.3" - depends_on: - - variant: "build-debian11" - name: "build-php-8.3" - tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" - display_tasks: - - name: "test-ocsp-latest" - execution_tasks: - - ".ocsp .latest" - - name: "test-ocsp-rapid" - execution_tasks: - - ".ocsp .rapid" - - name: "test-ocsp-7.0" - execution_tasks: - - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - - name: test-debian92-php-8.3 - tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.3" - run_on: debian92-small - expansions: - FETCH_BUILD_VARIANT: "build-debian92" - FETCH_BUILD_TASK: "build-php-8.3" - depends_on: - - variant: "build-debian92" - name: "build-php-8.3" - tasks: - # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" - display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - - name: "test-ocsp-4.4" - execution_tasks: - - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/libmongoc-php-8.3.yml b/.evergreen/config/generated/test-variant/libmongoc-php-8.3.yml index fb6688fd1..e9ba7ff99 100644 --- a/.evergreen/config/generated/test-variant/libmongoc-php-8.3.yml +++ b/.evergreen/config/generated/test-variant/libmongoc-php-8.3.yml @@ -1,23 +1,23 @@ # This file is generated automatically - please edit the "templates/test-variant/libmongoc.yml" template file instead. buildvariants: # Variants with different libmongoc - - name: test-debian11-php-8.3-libmongoc-lowest-supported - display_name: "Test: Debian 11, PHP 8.3, libmongoc lowest" + - name: test-debian12-php-8.3-libmongoc-lowest-supported tags: ["test", "libmongoc", "debian", "x64", "php8.3", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3, libmongoc lowest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3-libmongoc-lowest-supported" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3-libmongoc-lowest-supported" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -25,30 +25,30 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-8.3-libmongoc-next-stable - display_name: "Test: Debian 11, PHP 8.3, libmongoc next stable" + - name: test-debian12-php-8.3-libmongoc-next-stable tags: ["test", "libmongoc", "debian", "x64", "php8.3", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3, libmongoc next stable" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3-libmongoc-next-stable" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3-libmongoc-next-stable" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -56,30 +56,30 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-8.3-libmongoc-latest + - name: test-debian12-php-8.3-libmongoc-latest tags: ["test", "libmongoc", "debian", "x64", "php8.3"] - display_name: "Test: Debian 11, PHP 8.3, libmongoc latest" - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3, libmongoc latest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3-libmongoc-latest" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3-libmongoc-latest" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -87,9 +87,9 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" diff --git a/.evergreen/config/generated/test/load-balanced-8.0.yml b/.evergreen/config/generated/test/load-balanced-8.0.yml new file mode 100644 index 000000000..925048950 --- /dev/null +++ b/.evergreen/config/generated/test/load-balanced-8.0.yml @@ -0,0 +1,16 @@ +# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. +tasks: + - name: "test-mongodb-8.0-loadbalanced" + tags: ["loadbalanced", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "8.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/generated/test/local-8.0.yml b/.evergreen/config/generated/test/local-8.0.yml new file mode 100644 index 000000000..a5e1934ee --- /dev/null +++ b/.evergreen/config/generated/test/local-8.0.yml @@ -0,0 +1,60 @@ +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. +tasks: + - name: "test-mongodb-8.0-standalone-noauth-nossl" + tags: ["standalone", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-standalone-auth" + tags: ["standalone", "local", "8.0", "auth", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-standalone-ssl" + tags: ["standalone", "local", "8.0", "ssl", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "8.0" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-8.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-replicaset-auth" + tags: ["replicaset", "local", "8.0", "auth", "pr", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-sharded-noauth-nossl" + tags: ["sharded", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "8.0" + - func: "run tests" diff --git a/.evergreen/config/generated/test/ocsp-8.0.yml b/.evergreen/config/generated/test/ocsp-8.0.yml new file mode 100644 index 000000000..17aa21b74 --- /dev/null +++ b/.evergreen/config/generated/test/ocsp-8.0.yml @@ -0,0 +1,413 @@ +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. +tasks: + - name: "ocsp-test_1-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_1-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_1-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_1-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_2-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_2-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_2-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_2-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_3-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_3-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_3-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_3-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_4-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_4-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_4-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_4-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-soft_fail_test-rsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-soft_fail_test-ecdsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-malicious_server_test_2-rsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-malicious_server_test_2-ecdsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/generated/test/require-api-version-8.0.yml b/.evergreen/config/generated/test/require-api-version-8.0.yml new file mode 100644 index 000000000..d14abe7fa --- /dev/null +++ b/.evergreen/config/generated/test/require-api-version-8.0.yml @@ -0,0 +1,14 @@ +# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead. +tasks: + - name: "test-requireApiVersion-8.0" + tags: [ "standalone", "local", "8.0", "versioned_api", "tag" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "8.0" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/generated/test/skip-crypt-shared-8.0.yml b/.evergreen/config/generated/test/skip-crypt-shared-8.0.yml new file mode 100644 index 000000000..f0aae78a7 --- /dev/null +++ b/.evergreen/config/generated/test/skip-crypt-shared-8.0.yml @@ -0,0 +1,12 @@ +# This file is generated automatically - please edit the "templates/test/skip-crypt-shared.yml" template file instead. +tasks: + - name: "test-skip_crypt_shared-8.0" + tags: [ "replicaset", "local", "8.0", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "8.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/templates/test-variant/full.yml b/.evergreen/config/templates/test-variant/legacy-php-full.yml similarity index 64% rename from .evergreen/config/templates/test-variant/full.yml rename to .evergreen/config/templates/test-variant/legacy-php-full.yml index ff6bca62f..ddb5255ce 100644 --- a/.evergreen/config/templates/test-variant/full.yml +++ b/.evergreen/config/templates/test-variant/legacy-php-full.yml @@ -1,4 +1,6 @@ +# TODO PHPC-2343: This file can be removed when requiring PHP 8.1+ buildvariants: + # Test MongoDB >= 5.0, < 8.0 - name: test-debian11-php-%phpVersion% tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] display_name: "Test: Debian 11, PHP %phpVersion%" @@ -10,12 +12,13 @@ buildvariants: - variant: "build-debian11" name: "build-php-%phpVersion%" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.8.0" + - ".ocsp !.4.4 !.8.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -29,7 +32,11 @@ buildvariants: - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-%phpVersion% tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] display_name: "Test: Debian 9.2, PHP %phpVersion%" @@ -42,15 +49,12 @@ buildvariants: name: "build-php-%phpVersion%" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/templates/test-variant/libmongoc.yml b/.evergreen/config/templates/test-variant/libmongoc.yml index 1ff5eb66d..43329d1d8 100644 --- a/.evergreen/config/templates/test-variant/libmongoc.yml +++ b/.evergreen/config/templates/test-variant/libmongoc.yml @@ -1,22 +1,22 @@ buildvariants: # Variants with different libmongoc - - name: test-debian11-php-%phpVersion%-libmongoc-lowest-supported - display_name: "Test: Debian 11, PHP %phpVersion%, libmongoc lowest" + - name: test-debian12-php-%phpVersion%-libmongoc-lowest-supported tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc lowest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-lowest-supported" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-%phpVersion%-libmongoc-lowest-supported" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -24,30 +24,30 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-%phpVersion%-libmongoc-next-stable - display_name: "Test: Debian 11, PHP %phpVersion%, libmongoc next stable" + - name: test-debian12-php-%phpVersion%-libmongoc-next-stable tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc next stable" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-next-stable" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-%phpVersion%-libmongoc-next-stable" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -55,30 +55,30 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-%phpVersion%-libmongoc-latest + - name: test-debian12-php-%phpVersion%-libmongoc-latest tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"] - display_name: "Test: Debian 11, PHP %phpVersion%, libmongoc latest" - run_on: debian11-small + display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-%phpVersion%-libmongoc-latest" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -86,9 +86,9 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" diff --git a/.evergreen/config/templates/test-variant/modern-php-full.yml b/.evergreen/config/templates/test-variant/modern-php-full.yml new file mode 100644 index 000000000..21bf78fd0 --- /dev/null +++ b/.evergreen/config/templates/test-variant/modern-php-full.yml @@ -0,0 +1,81 @@ +buildvariants: + # Test MongoDB >= 7.0 + - name: test-debian12-php-%phpVersion% + tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: Debian 12, PHP %phpVersion%" + run_on: debian12-small + expansions: + FETCH_BUILD_VARIANT: "build-debian12" + FETCH_BUILD_TASK: "build-php-%phpVersion%" + depends_on: + - variant: "build-debian12" + name: "build-php-%phpVersion%" + tasks: + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-%phpVersion% + tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: Debian 11, PHP %phpVersion%" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-%phpVersion%" + depends_on: + - variant: "build-debian11" + name: "build-php-%phpVersion%" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-%phpVersion% + tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP %phpVersion%" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-%phpVersion%" + depends_on: + - variant: "build-debian92" + name: "build-php-%phpVersion%" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" diff --git a/config.m4 b/config.m4 index 35e30eddd..ba684486a 100644 --- a/config.m4 +++ b/config.m4 @@ -447,10 +447,10 @@ if test "$PHP_MONGODB" != "no"; then if test "x$bundled_zlib" = "xyes"; then PHP_MONGODB_ZLIB_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_ZLIB_CFLAGS" - PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/zlib-1.2.13/], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_ZLIB_CFLAGS) - PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/zlib-1.2.13/]) - PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/zlib-1.2.13/]) - AC_CONFIG_FILES([${ac_config_dir}/src/libmongoc/src/zlib-1.2.13/zconf.h]) + PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/zlib-1.3.1/], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_ZLIB_CFLAGS) + PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/zlib-1.3.1/]) + PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/zlib-1.3.1/]) + AC_CONFIG_FILES([${ac_config_dir}/src/libmongoc/src/zlib-1.3.1/zconf.h]) fi if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then diff --git a/scripts/update-submodule-sources.php b/scripts/update-submodule-sources.php index ee295ca7e..124d04616 100644 --- a/scripts/update-submodule-sources.php +++ b/scripts/update-submodule-sources.php @@ -14,7 +14,7 @@ 'PHP_MONGODB_JSONSL_SOURCES' => 'src/libmongoc/src/libbson/src/jsonsl', 'PHP_MONGODB_MONGOC_SOURCES' => 'src/libmongoc/src/libmongoc/src/mongoc', 'PHP_MONGODB_UTF8PROC_SOURCES' => 'src/libmongoc/src/utf8proc-2.8.0', - 'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.2.13', + 'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.3.1', 'PHP_MONGODB_MONGOCRYPT_SOURCES' => 'src/libmongocrypt/src', 'PHP_MONGODB_MONGOCRYPT_CRYPTO_SOURCES' => 'src/libmongocrypt/src/crypto', 'PHP_MONGODB_MONGOCRYPT_OS_POSIX_SOURCES' => 'src/libmongocrypt/src/os_posix', diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT index ed528dc9a..1d2b52dee 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.28.0-20240611+git51b87cd6e5 +1.28.0-20240627+gite87940820c diff --git a/src/libmongoc b/src/libmongoc index 51b87cd6e..e87940820 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 51b87cd6e5cbbee6bca897727332c3214cf4ada9 +Subproject commit e87940820c7c643172e7d005484e7cf1ee824bec