Skip to content

Commit 74064e4

Browse files
derickrjmikola
derickr
authored and
jmikola
committed
PHPC-1271: Add (only) RHEL on zSeries to Evergreen Matrix
1 parent 4f5f9f0 commit 74064e4

Some content is hidden

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

66 files changed

+213
-194
lines changed

‎.evergreen/config.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,9 @@ axes:
639639
- id: rhel70-test
640640
display_name: "RHEL 7.0"
641641
run_on: rhel70
642-
- id: rhel72-zseries
643-
display_name: "RHEL 7.2 zSeries"
644-
run_on: rhel72-zseries-test
642+
- id: rhel71-power8
643+
display_name: "RHEL 7.1 Power 8"
644+
run_on: rhel71-power8-test
645645
- id: os-php7
646646
display_name: OS
647647
values:
@@ -651,8 +651,11 @@ axes:
651651
- id: rhel70-test
652652
display_name: "RHEL 7.0"
653653
run_on: rhel70
654-
- id: rhel72-zseries
655-
display_name: "RHEL 7.2 zSeries"
654+
- id: rhel71-power8
655+
display_name: "RHEL 7.1 Power 8"
656+
run_on: rhel71-power8-test
657+
- id: rhel74-zseries
658+
display_name: "RHEL 7.4 zSeries"
656659
run_on: rhel72-zseries-test
657660

658661
buildvariants:
@@ -682,7 +685,7 @@ buildvariants:
682685

683686
- matrix_name: "mongo-30-php7"
684687
matrix_spec: {"os-php7": "*", "versions": ["3.0", "3.2", "3.4"], "php-versions": "7.2" }
685-
exclude_spec: {"os-php7": "rhel71-power8", "versions": "3.0", "php-versions": "7.2"}
688+
exclude_spec: [ {"os-php7": "rhel71-power8", "versions": "3.0", "php-versions": "7.2"}, {"os-php7": "rhel74-zseries", "versions": ["3.0", "3.2"], "php-versions": "7.2"} ]
686689
display_name: "${versions}/${php-versions} — ${os-php7}"
687690
tasks:
688691
- name: "test-standalone-old"
@@ -721,6 +724,8 @@ buildvariants:
721724

722725
- matrix_name: "mongo-40-php7"
723726
matrix_spec: {"os-php7": "*", "versions": ["4.0", "latest"], "php-versions": "7.2" }
727+
exclude_spec:
728+
- {"os-php7": "rhel74-zseries", "versions": ["4.0", "latest"], "php-versions": "7.2"}
724729
display_name: "${versions}/${php-versions} — ${os-php7}"
725730
tasks:
726731
- name: "test-standalone"
@@ -731,3 +736,15 @@ buildvariants:
731736
- name: "test-replicaset-single"
732737
- name: "test-sharded"
733738
- name: "test-sharded-rs"
739+
740+
- matrix_name: "mongo-40-php7-nossl"
741+
matrix_spec: {"os-php7": "rhel74-zseries", "versions": ["4.0", "latest"], "php-versions": "7.2"}
742+
display_name: "${versions}/${php-versions} — ${os-php7}"
743+
tasks:
744+
- name: "test-standalone"
745+
- name: "test-standalone-auth"
746+
- name: "test-replicaset"
747+
- name: "test-replicaset-auth"
748+
- name: "test-replicaset-single"
749+
- name: "test-sharded"
750+
- name: "test-sharded-rs"

‎php_phongo.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
19-
#endif
20-
2117
/* External libs */
2218
#include "bson/bson.h"
2319
#include "mongoc/mongoc.h"
@@ -34,6 +30,10 @@
3430
#include <ext/spl/spl_exceptions.h>
3531
#include <ext/standard/php_var.h>
3632

33+
#ifdef HAVE_CONFIG_H
34+
#include "config.h"
35+
#endif
36+
3737
#if PHP_VERSION_ID >= 70000
3838
#include <Zend/zend_smart_str.h>
3939
#else

‎src/BSON/Binary.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
19-
#endif
20-
2117
#include <php.h>
2218
#include <ext/standard/base64.h>
2319
#include <Zend/zend_interfaces.h>
@@ -29,6 +25,10 @@
2925
#include <ext/standard/php_smart_str.h>
3026
#endif
3127

28+
#ifdef HAVE_CONFIG_H
29+
#include "config.h"
30+
#endif
31+
3232
#include "phongo_compat.h"
3333
#include "php_phongo.h"
3434

‎src/BSON/BinaryInterface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include <php.h>
18+
1719
#ifdef HAVE_CONFIG_H
1820
#include "config.h"
1921
#endif
2022

21-
#include <php.h>
22-
2323
#include "phongo_compat.h"
2424
#include "php_phongo.h"
2525

‎src/BSON/DBPointer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
19-
#endif
20-
2117
#include <php.h>
2218
#include <Zend/zend_interfaces.h>
2319
#include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
2723
#include <ext/standard/php_smart_str.h>
2824
#endif
2925

26+
#ifdef HAVE_CONFIG_H
27+
#include "config.h"
28+
#endif
29+
3030
#include "phongo_compat.h"
3131
#include "php_phongo.h"
3232
#include "php_bson.h"

‎src/BSON/Decimal128.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
19-
#endif
20-
2117
#include <php.h>
2218
#include <Zend/zend_interfaces.h>
2319
#include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
2723
#include <ext/standard/php_smart_str.h>
2824
#endif
2925

26+
#ifdef HAVE_CONFIG_H
27+
#include "config.h"
28+
#endif
29+
3030
#include "phongo_compat.h"
3131
#include "php_phongo.h"
3232

‎src/BSON/Decimal128Interface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include <php.h>
18+
1719
#ifdef HAVE_CONFIG_H
1820
#include "config.h"
1921
#endif
2022

21-
#include <php.h>
22-
2323
#include "phongo_compat.h"
2424
#include "php_phongo.h"
2525

‎src/BSON/Int64.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
19-
#endif
20-
2117
#include <php.h>
2218
#include <Zend/zend_interfaces.h>
2319
#include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
2723
#include <ext/standard/php_smart_str.h>
2824
#endif
2925

26+
#ifdef HAVE_CONFIG_H
27+
#include "config.h"
28+
#endif
29+
3030
#include "phongo_compat.h"
3131
#include "php_phongo.h"
3232
#include "php_bson.h"

‎src/BSON/Javascript.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifdef HAVE_CONFIG_H
18-
#include "config.h"
19-
#endif
20-
2117
#include <php.h>
2218
#include <Zend/zend_interfaces.h>
2319
#include <ext/standard/php_var.h>
@@ -27,6 +23,10 @@
2723
#include <ext/standard/php_smart_str.h>
2824
#endif
2925

26+
#ifdef HAVE_CONFIG_H
27+
#include "config.h"
28+
#endif
29+
3030
#include "phongo_compat.h"
3131
#include "php_phongo.h"
3232
#include "php_bson.h"

‎src/BSON/JavascriptInterface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include <php.h>
18+
1719
#ifdef HAVE_CONFIG_H
1820
#include "config.h"
1921
#endif
2022

21-
#include <php.h>
22-
2323
#include "phongo_compat.h"
2424
#include "php_phongo.h"
2525

0 commit comments

Comments
 (0)