Skip to content

Commit

Permalink
Update CI configs for ext-mongodb 1.12.0 (#882)
Browse files Browse the repository at this point in the history
* Update extension version in CI configs for 1.12.0 release

* Bump extension requirement to 1.12.0

* Update shivammathur/setup-php requirements for v2
  • Loading branch information
jmikola authored Dec 14, 2021
1 parent 5490c08 commit e4aa59a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 37 deletions.
35 changes: 8 additions & 27 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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" }
Expand All @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
php-version:
- "7.4"
driver-version:
- "mongodb/mongo-php-driver@master"
- "stable"

steps:
- name: "Checkout"
Expand All @@ -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 }}"
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit e4aa59a

Please sign in to comment.