Skip to content

Commit 37408e1

Browse files
committed
Merge branch 'v1.9'
* v1.9: PHPC-1739 Move from travis-ci to GitHub Actions (#1199) PHPC-1774 Fix truncation of PHP_VERSION constant in handshake metadata (#1202) PHPC-1775 Use correct size for strncpy in when initialising DBPointer (#1203)
2 parents f1bdaa4 + ed31cba commit 37408e1

File tree

92 files changed

+321
-22475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+321
-22475
lines changed

.evergreen/config.yml

Lines changed: 92 additions & 121 deletions
Large diffs are not rendered by default.

scripts/presets/travis/replica_sets/replicaset-old.json renamed to .evergreen/orchestration/configs/replica_sets/replicaset-old.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id": "REPLICASET_OLD",
2+
"id": "repl0",
33
"name": "mongod",
44
"members": [
55
{
@@ -12,13 +12,11 @@
1212
"bind_ip": "::,0.0.0.0"
1313
},
1414
"rsParams": {
15-
"priority": 99,
1615
"tags": {
1716
"ordinal": "one",
18-
"dc": "pa"
17+
"dc": "ny"
1918
}
20-
},
21-
"server_id": "RS-OLD-one"
19+
}
2220
},
2321
{
2422
"procParams": {
@@ -30,13 +28,11 @@
3028
"bind_ip": "::,0.0.0.0"
3129
},
3230
"rsParams": {
33-
"priority": 1.1,
3431
"tags": {
3532
"ordinal": "two",
36-
"dc": "nyc"
33+
"dc": "pa"
3734
}
38-
},
39-
"server_id": "RS-OLD-two"
35+
}
4036
},
4137
{
4238
"procParams": {
@@ -50,8 +46,7 @@
5046
"rsParams": {
5147
"arbiterOnly": true
5248

53-
},
54-
"server_id": "RS-OLD-arbiter"
49+
}
5550
}
5651
]
5752
}

.evergreen/run-orchestration.sh

Lines changed: 0 additions & 78 deletions
This file was deleted.

.evergreen/start-orchestration.sh

Lines changed: 0 additions & 69 deletions
This file was deleted.

.github/workflows/clang-format.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: "Coding Standards"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "v*.*"
7+
- "master"
8+
push:
9+
branches:
10+
- "v*.*"
11+
- "master"
12+
13+
jobs:
14+
coding-standards:
15+
name: "Coding Standards"
16+
runs-on: "ubuntu-20.04"
17+
18+
strategy:
19+
matrix:
20+
php-version:
21+
- "7.4"
22+
23+
steps:
24+
- name: "Checkout"
25+
uses: "actions/checkout@v2"
26+
with:
27+
submodules: true
28+
29+
- name: "Install PHP"
30+
uses: "shivammathur/setup-php@v2"
31+
with:
32+
php-version: "${{ matrix.php-version }}"
33+
extensions: ":mongodb"
34+
tools: "phpize"
35+
36+
- name: "Configure driver"
37+
run: .github/workflows/configure.sh
38+
39+
- name: "Run clang-format"
40+
run: "make format-check"

.github/workflows/configure.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
3+
CONFIGURE_OPTS="${CONFIGURE_OPTS} --enable-mongodb-developer-flags --enable-mongodb-coverage"
4+
5+
if [ -n "${SSL_VERSION}" ]; then
6+
CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-mongodb-ssl=${SSL_VERSION}"
7+
fi
8+
9+
phpize
10+
./configure ${CONFIGURE_OPTS}

.github/workflows/tests.yml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: "Tests"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "v*.*"
7+
- "master"
8+
push:
9+
branches:
10+
- "v*.*"
11+
- "master"
12+
13+
jobs:
14+
tests:
15+
name: "Tests"
16+
runs-on: "${{ matrix.os }}"
17+
18+
strategy:
19+
fail-fast: true
20+
matrix:
21+
os:
22+
- "ubuntu-20.04"
23+
php-version:
24+
- "7.4"
25+
- "8.0"
26+
mongodb-version:
27+
- "4.4"
28+
topology:
29+
- "server"
30+
include:
31+
- os: "ubuntu-20.04"
32+
php-version: "8.0"
33+
mongodb-version: "4.4"
34+
topology: "replica_set"
35+
- os: "ubuntu-20.04"
36+
php-version: "8.0"
37+
mongodb-version: "4.4"
38+
topology: "sharded_cluster"
39+
40+
steps:
41+
- name: "Checkout"
42+
uses: "actions/checkout@v2"
43+
with:
44+
fetch-depth: 2
45+
submodules: true
46+
47+
- id: setup-mongodb
48+
uses: mongodb-labs/drivers-evergreen-tools@master
49+
with:
50+
version: ${{ matrix.mongodb-version }}
51+
topology: ${{ matrix.topology }}
52+
53+
- name: "Install PHP"
54+
uses: "shivammathur/setup-php@v2"
55+
with:
56+
php-version: "${{ matrix.php-version }}"
57+
extensions: ":mongodb"
58+
tools: "phpize"
59+
60+
- name: "Configure driver"
61+
run: .github/workflows/configure.sh
62+
63+
- name: "Build driver"
64+
run: "make all"
65+
66+
- name: "Run Tests"
67+
run: TEST_PHP_ARGS="-q -x --show-diff -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP" make test
68+
env:
69+
MONGODB_URI: ${{ steps.setup-mongodb.outputs.cluster-uri }}

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ php.ini
4949
.*
5050
!.github/
5151
!tests/utils/*.php
52-
!.travis.yml
53-
!.travis.scripts/
5452
!.evergreen
5553
.evergreen/atlas-uris.txt
5654

.travis.scripts/before_install.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

.travis.scripts/before_script.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

.travis.scripts/debug-core.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)