Skip to content

Commit 6107272

Browse files
committed
Merge branch 'v1.9' into v1.10
2 parents 9e0da59 + 6627ea1 commit 6107272

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/coding-standards.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
php-version:
2121
- "7.4"
2222
driver-version:
23-
- "mongodb/mongo-php-driver@master"
23+
- "stable"
2424

2525
steps:
2626
- name: "Checkout"
@@ -42,8 +42,7 @@ jobs:
4242
restore-keys: ${{ steps.extcache.outputs.key }}
4343

4444
- name: "Install PHP"
45-
# Todo: switch to @v2 once a tag has been created
46-
uses: "shivammathur/setup-php@develop"
45+
uses: "shivammathur/setup-php@v2"
4746
with:
4847
coverage: "none"
4948
extensions: "mongodb-${{ matrix.driver-version }}"

.github/workflows/tests.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ jobs:
2727
mongodb-version:
2828
- "4.4"
2929
driver-version:
30-
- "mongodb/mongo-php-driver@master"
30+
- "stable"
3131
topology:
3232
- "server"
3333
include:
3434
- os: "ubuntu-20.04"
3535
php-version: "8.0"
3636
mongodb-version: "5.0"
37-
driver-version: "mongodb/mongo-php-driver@master"
37+
driver-version: "stable"
3838
topology: "server"
3939
- os: "ubuntu-20.04"
4040
php-version: "8.0"
4141
mongodb-version: "4.4"
42-
driver-version: "mongodb/mongo-php-driver@master"
42+
driver-version: "stable"
4343
topology: "replica_set"
4444
- os: "ubuntu-20.04"
4545
php-version: "8.0"
4646
mongodb-version: "4.4"
47-
driver-version: "mongodb/mongo-php-driver@master"
47+
driver-version: "stable"
4848
topology: "sharded_cluster"
4949

5050
steps:
@@ -75,8 +75,7 @@ jobs:
7575
restore-keys: ${{ steps.extcache.outputs.key }}
7676

7777
- name: "Install PHP"
78-
# Todo: switch to @v2 once a tag has been created
79-
uses: "shivammathur/setup-php@develop"
78+
uses: "shivammathur/setup-php@v2"
8079
with:
8180
php-version: "${{ matrix.php-version }}"
8281
tools: "pecl"

0 commit comments

Comments
 (0)