-
Notifications
You must be signed in to change notification settings - Fork 211
PHPC-888: Support additional TLS libraries for bundled libmongoc #736
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
b1a6690
Do not ignore nested "build" directories
jmikola 8af9175
Fix conditional for whether extension is enabled
jmikola 274a444
Use single equal sign for test comparisons
jmikola d679bfe
PHPC-888: Support additional TLS libraries for bundled libmongoc
jmikola 16fe17c
Remove old API key for Coveralls
jmikola 0e686fd
Remove old Mongo Orchestration artifacts
jmikola 28c717b
Do not ignore files within .travis.scripts/
jmikola 83f3330
LibreSSL cannot extract username subject from X509 certs
jmikola 61d4ffb
Coveralls API token is not needed for public projects
jmikola df9c278
Make core and diff debugging more portable
jmikola d4e998f
Add macOS environments to build matrix
jmikola 071f90b
Upgrading run-tests.php is no longer necessary
jmikola 40cbec3
Remove macOS environments from build matrix
jmikola fe7ee68
PHPC-1003: Use container environment for Travis builds
jmikola 0f8598f
Use AC_HELP_STRING for PHP_ARG_ENABLE in config.m4
derickr c2988bb
PHPC-888: Make sure you can only select "darwin" on macOS
derickr 0002e2d
Move crypto system profile flags below OpenSSL detection
derickr 6f9bd6e
Document "no" defaults for PHP_ARG_ENABLE flags in config.m4
jmikola 82516b3
Use AC_HELP_STRING for PHP_ARG_WITH in config.m4
jmikola File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
.travis.scripts/before_install.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #!/bin/sh | ||
|
|
||
| if [ "${TRAVIS_OS_NAME}" = "linux" ]; then | ||
| # https://github.com/eddyxu/cpp-coveralls#linux | ||
| pip install --user cpp-coveralls | ||
| fi | ||
|
|
||
| if [ "${TRAVIS_OS_NAME}" = "osx" ]; then | ||
| brew update | ||
| brew upgrade | ||
|
|
||
| brew tap homebrew/homebrew-php | ||
| brew install "${PHP_VERSION}" | ||
|
|
||
| # http://brewformulas.org/Lcov | ||
| brew install lcov | ||
|
|
||
| # https://github.com/eddyxu/cpp-coveralls#os-x | ||
| brew install pyenv | ||
| eval "$(pyenv init -)" | ||
| pyenv install 2.7.6 | ||
| pyenv global 2.7.6 | ||
| pyenv rehash | ||
| pip install cpp-coveralls | ||
| pyenv rehash | ||
| fi |
18 changes: 18 additions & 0 deletions
.travis.scripts/before_script.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/bin/sh | ||
|
|
||
| CONFIGURE_OPTS="--enable-developer-flags --enable-coverage" | ||
|
|
||
| if [ -n "${SSL_VERSION}" ]; then | ||
| CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-mongodb-ssl=${SSL_VERSION}" | ||
| fi | ||
|
|
||
| phpize | ||
| ./configure ${CONFIGURE_OPTS} | ||
| make all -j4 | ||
| make install | ||
|
|
||
| # Add the extension to php.ini | ||
| echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` | ||
|
|
||
| # Predefine the test server | ||
| echo '{"STANDALONE": "mongodb:\/\/127.0.0.1:27017"}' > /tmp/PHONGO-SERVERS.json |
42 changes: 0 additions & 42 deletions
.travis.scripts/compile.sh
Oops, something went wrong.
9 changes: 7 additions & 2 deletions
.travis.scripts/debug-core.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| #!/bin/sh | ||
|
|
||
| PHP=/home/travis/.phpenv/versions/`php -r 'echo PHP_VERSION;'`/bin/php | ||
| echo "backtrace full" | gdb $PHP 1ドル | ||
| if [ "${TRAVIS_OS_NAME}" != "osx" ]; then | ||
| # https://www.ics.uci.edu/~pattis/common/handouts/macmingweclipse/allexperimental/mac-gdb-install.html | ||
| echo "Cannot debug core files on macOS: ${1}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| PHP_BINARY=`which php` | ||
| gdb -batch -ex "bt full" -ex "quit" "${PHP_BINARY}" "${1}" |
15 changes: 15 additions & 0 deletions
.travis.scripts/debug-diff.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #!/bin/sh | ||
|
|
||
| EXP=`echo 1ドル | sed 's/.diff$/.exp/'` | ||
| OUT=`echo 1ドル | sed 's/.diff$/.out/'` | ||
| SEP="--------------------------------------------------------------------------------" | ||
|
|
||
| echo $EXP | ||
| echo $SEP | ||
| cat $EXP; echo | ||
| echo $SEP; echo | ||
|
|
||
| echo $OUT | ||
| echo $SEP | ||
| cat $OUT; echo | ||
| echo $SEP; echo |
19 changes: 0 additions & 19 deletions
.travis.scripts/debug-script.sh
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,33 @@ | ||
| language: php | ||
| php: | ||
| - 7.2 | ||
| - 7.1 | ||
| - 7.0 | ||
| - 5.6 | ||
| - 5.5 | ||
|
|
||
| addons: | ||
| apt: | ||
| packages: | ||
| - gdb | ||
| - lcov | ||
|
|
||
| matrix: | ||
| include: | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: false | ||
| php: 5.5 | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: false | ||
| php: 5.6 | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: false | ||
| php: 7.0 | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: false | ||
| php: 7.1 | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: false | ||
| php: 7.2 | ||
|
|
||
| services: | ||
| - mongodb | ||
|
|
@@ -13,24 +36,15 @@ env: | |
| global: | ||
| - TEST_PHP_ARGS="-q -s output.txt -g XFAIL,FAIL,BORK,WARN,LEAK,SKIP -x --show-diff" | ||
| - REPORT_EXIT_STATUS=1 | ||
| - MONGODB_ORCHESTRATION="http://localhost:8889" | ||
| - MONGODB_ORCHESTRATION_REPO="git+git://github.com/mongodb/mongo-orchestration@master" | ||
| - MONGODB_ORCHESTRATION_PRESETS_ROOT=`pwd` | ||
| - secure: "Dofd9NvXIKEat1PMiia3RQgNsJLaKtzZRf9rM4MsqFaBQPbJmVWPANJkayJPcK+l8pLxHyzzH7WqxML+SlBhBTHdJB++1woXxoVwm+sDdwSye6e+eXc3/zRUxb7zyItBZcvVp2tIJpx5kXJb+CoUQakbfWEQQFk4xrOF0R56+8Y=" | ||
| - secure: "pfGVPucvgcgcefhtzAVeejlpOtn4TnAqJSTM8mJkBl36KdU9P7hMuD3czQ4drWgzZ373/VT5UVhLu/HNsdbW0YBTeqPKJ4YNjqVVLytI8xT7y2Lw9l+I7o93j98TMgAoo8nVRmp/E4D6yutbKK1eddrcmf899R1iJbw8v8d1Ht8=" | ||
|
|
||
| before_install: | ||
| - sudo pip install --upgrade cpp-coveralls | ||
| - sudo pip install ${MONGODB_ORCHESTRATION_REPO} | ||
|
||
| - sudo apt-get update | ||
| - sudo apt-get install gdb valgrind | ||
| - sudo apt-get install cdbs debhelper build-essential python-lxml | ||
| - .travis.scripts/before_install.sh | ||
| - php -r 'if ( ! ($f = php_ini_loaded_file())) { $f = PHP_CONFIG_FILE_PATH . "/php.ini"; } file_put_contents($f, "variables_order=EGPCS\n", FILE_APPEND); $a = file($f, FILE_IGNORE_NEW_LINES); var_dump($a[count($a)-1]);' | ||
|
|
||
| before_script: | ||
| - ulimit -a | ||
| - ulimit -c unlimited || true | ||
| - "./.travis.scripts/compile.sh" | ||
| - .travis.scripts/before_script.sh | ||
|
|
||
| script: | ||
| - make test | ||
|
|
@@ -39,5 +53,5 @@ after_success: | |
| - make coveralls | ||
|
|
||
| after_failure: | ||
| - find . -name \*core\* -exec ./.travis.scripts/debug-core.sh {} \; | ||
| - find . -name \*diff -exec ./.travis.scripts/debug-script.sh {} \; | ||
| - find . -name 'core*' -exec .travis.scripts/debug-core.sh {} \; | ||
| - find . -name '*.diff' -exec .travis.scripts/debug-diff.sh {} \; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.