Test against v2.x

GromNaN · GromNaN · commit fb9ae454a1a7 · 2025-05-09T13:38:08.000+02:00
diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml
diff --git a/.evergreen/config/templates/build/build-extension.yml b/.evergreen/config/templates/build/build-extension.yml
@@ -34,8 +34,5 @@
           PHP_VERSION: "%phpVersion%"
       - func: "compile extension"
         vars:
-          # TODO: replace with "v2.x" once mongodb/mongo-php-driver#1790 is merged
-          # EXTENSION_BRANCH: "v2.x"
-          EXTENSION_REPO: "https://github.com/jmikola/mongo-php-driver.git"
-          EXTENSION_BRANCH: "2.x-bulkwrite"
+          EXTENSION_BRANCH: "v2.x"
       - func: "upload extension"
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,9 +15,7 @@ env:
   PHP_VERSION: "8.2"
   # TODO: change to "stable" once 2.0.0 is released
   # DRIVER_VERSION: "stable"
-  # TODO: change to "mongodb/mongo-php-driver@v2.x" once mongodb/mongo-php-driver#1790 is merged
-  # DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
-  DRIVER_VERSION: "jmikola/mongo-php-driver@2.x-bulkwrite"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   phpcs:
diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml
@@ -15,9 +15,7 @@ env:
   PHP_VERSION: "8.2"
   # TODO: change to "stable" once 2.0.0 is released
   # DRIVER_VERSION: "stable"
-  # TODO: change to "mongodb/mongo-php-driver@v2.x" once mongodb/mongo-php-driver#1790 is merged
-  # DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
-  DRIVER_VERSION: "jmikola/mongo-php-driver@2.x-bulkwrite"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   diff:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -21,9 +21,7 @@ env:
   PHP_VERSION: "8.2"
   # TODO: change to "stable" once 2.0.0 is released
   # DRIVER_VERSION: "stable"
-  # TODO: change to "mongodb/mongo-php-driver@v2.x" once mongodb/mongo-php-driver#1790 is merged
-  # DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
-  DRIVER_VERSION: "jmikola/mongo-php-driver@2.x-bulkwrite"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   psalm:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,9 +14,7 @@ on:
 env:
   # TODO: change to "stable" once 2.0.0 is released
   # DRIVER_VERSION: "stable"
-  # TODO: change to "mongodb/mongo-php-driver@v2.x" once mongodb/mongo-php-driver#1790 is merged
-  # DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
-  DRIVER_VERSION: "jmikola/mongo-php-driver@2.x-bulkwrite"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   phpunit:

-Original file line number
+Diff line change
   PHP_VERSION: "8.2"
   # TODO: change to "stable" once 2.0.0 is released
   # DRIVER_VERSION: "stable"
 -  # TODO: change to "mongodb/[email protected]" once mongodb/mongo-php-driver#1790 is merged
 -  # DRIVER_VERSION: "mongodb/[email protected]"
 -  DRIVER_VERSION: "jmikola/[email protected]"
 +  DRIVER_VERSION: "mongodb/[email protected]"
 jobs:
   phpcs: