Merge branch 'bpo/2.9/#3702' into 2.9

d389f32c · Sergei Morozov · 94b1ea2c · 5ac70f61 · d389f32c · d389f32c
Unverified Commit d389f32c authored Oct 26, 2019 by Sergei Morozov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 13 deletions

.travis.yml .travis.yml +0 -3

install-mssql-pdo_sqlsrv.sh tests/travis/install-mssql-pdo_sqlsrv.sh +1 -5

install-mssql-sqlsrv.sh tests/travis/install-mssql-sqlsrv.sh +1 -5

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,9 +41,6 @@ after_script:
    fi

 jobs:
-  allow_failures:
-    - php: 7.4snapshot
-
  include:
    - stage: Test
      php: 7.1

--- a/tests/travis/install-mssql-pdo_sqlsrv.sh
+++ b/tests/travis/install-mssql-pdo_sqlsrv.sh
@@ -4,8 +4,4 @@ set -ex

 echo "Installing extension"

-if [ "$TRAVIS_PHP_VERSION" == "7.3" ] || [ "$TRAVIS_PHP_VERSION" == "nightly" ] ; then
-  pecl install pdo_sqlsrv-5.4.0preview
-else
-  pecl install pdo_sqlsrv
-fi
+pecl install pdo_sqlsrv-5.7.0preview
--- a/tests/travis/install-mssql-sqlsrv.sh
+++ b/tests/travis/install-mssql-sqlsrv.sh
@@ -4,8 +4,4 @@ set -ex

 echo "Installing extension"

-if [ "$TRAVIS_PHP_VERSION" == "7.3" ] || [ "$TRAVIS_PHP_VERSION" == "nightly" ] ; then
-  pecl install sqlsrv-5.4.0preview
-else
-  pecl install sqlsrv
-fi
+pecl install sqlsrv-5.7.0preview