diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 12435875a..c2258f6c2 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -609,21 +609,16 @@ axes: - id: driver-versions display_name: Driver Version values: - # TODO: Update references to master branch after PHPC 1.12 is released - - id: "lowest-supported" - # display_name: "1.11.0" - display_name: "1.12-dev" + - id: "oldest-supported" + display_name: "1.12.0" variables: - EXTENSION_BRANCH: "master" + EXTENSION_VERSION: "1.12.0" - id: "latest-stable" - # display_name: "Latest Stable (1.11.x)" - display_name: "1.12-dev" + display_name: "1.12.x" variables: - # EXTENSION_VERSION: "stable" - EXTENSION_BRANCH: "master" + EXTENSION_VERSION: "stable" - id: "latest-dev" - # display_name: "1.12-dev (master)" - display_name: "1.12-dev" + display_name: "1.13-dev (master)" variables: EXTENSION_BRANCH: "master" @@ -728,20 +723,6 @@ buildvariants: - name: "test-replica_set" - name: "test-sharded_cluster" -# Tests all driver versions on all PHP versions using latest MongoDB and Ubuntu 18.04 -- matrix_name: "test-driver-versions" - matrix_spec: { "os": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": "*", "driver-versions": "*" } - exclude_spec: - # Avoid duplicate build variants from test-php-versions - - { "os": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": "*", "driver-versions": "lowest-supported" } - - { "os": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": "*", "driver-versions": "latest-stable" } - - { "os": "ubuntu1804-arm64-test", "edge-versions": "latest-stable", "php-versions": "*", "driver-versions": "latest-dev" } - display_name: "${os}, MongoDB ${edge-versions}, PHP ${php-versions}, ext-mongodb ${driver-versions}" - tasks: - - name: "test-standalone" - - name: "test-replica_set" - - name: "test-sharded_cluster" - # Tests all MongoDB versions with latest stable PHP and driver versions - matrix_name: "test-mongodb-versions" matrix_spec: { "os": "debian92-test", "versions": "*", "php-edge-versions": "latest-stable", "driver-versions": "latest-stable" } @@ -754,10 +735,10 @@ buildvariants: - name: "test-replica_set" - name: "test-sharded_cluster" -# Tests all MongoDB versions with lowest supported PHP and driver versions +# Tests all MongoDB versions with oldest supported PHP and driver versions # Enables --prefer-lowest for composer to test oldest dependencies against all server versions - matrix_name: "test-dependencies" - matrix_spec: { "os": "debian92-test", "versions": "*", "php-edge-versions": "oldest-supported", "driver-versions": "lowest-supported", "dependencies": "lowest" } + matrix_spec: { "os": "debian92-test", "versions": "*", "php-edge-versions": "oldest-supported", "driver-versions": "oldest-supported", "dependencies": "lowest" } display_name: "Lowest Dependencies: ${os}, MongoDB ${versions}, PHP ${php-edge-versions}, ext-mongodb ${driver-versions}" tasks: - name: "test-standalone" diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index b9f2fc134..0a584a558 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -20,7 +20,7 @@ jobs: php-version: - "7.4" driver-version: - - "mongodb/mongo-php-driver@master" + - "stable" steps: - name: "Checkout" @@ -42,8 +42,7 @@ jobs: restore-keys: ${{ steps.extcache.outputs.key }} - name: "Install PHP" - # Todo: switch to @v2 once a tag has been created - uses: "shivammathur/setup-php@develop" + uses: "shivammathur/setup-php@v2" with: coverage: "none" extensions: "mongodb-${{ matrix.driver-version }}" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e317da929..9a9f32c4f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,24 +27,24 @@ jobs: mongodb-version: - "4.4" driver-version: - - "mongodb/mongo-php-driver@master" + - "stable" topology: - "server" include: - os: "ubuntu-20.04" php-version: "8.0" mongodb-version: "5.0" - driver-version: "mongodb/mongo-php-driver@master" + driver-version: "stable" topology: "server" - os: "ubuntu-20.04" php-version: "8.0" mongodb-version: "4.4" - driver-version: "mongodb/mongo-php-driver@master" + driver-version: "stable" topology: "replica_set" - os: "ubuntu-20.04" php-version: "8.0" mongodb-version: "4.4" - driver-version: "mongodb/mongo-php-driver@master" + driver-version: "stable" topology: "sharded_cluster" steps: @@ -75,8 +75,7 @@ jobs: restore-keys: ${{ steps.extcache.outputs.key }} - name: "Install PHP" - # Todo: switch to @v2 once a tag has been created - uses: "shivammathur/setup-php@develop" + uses: "shivammathur/setup-php@v2" with: php-version: "${{ matrix.php-version }}" tools: "pecl" diff --git a/composer.json b/composer.json index a0b0ca6e3..915b429c2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "php": "^7.2 || ^8.0", "ext-hash": "*", "ext-json": "*", - "ext-mongodb": "^1.11.0", + "ext-mongodb": "^1.12.0", "jean85/pretty-package-versions": "^1.2 || ^2.0.1", "symfony/polyfill-php80": "^1.19" },