Skip to content
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.

Sign up for GitHub

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

Update images and enable leak detection, and split tests in CI to Unit, Integration and Web #299

Merged
merged 17 commits into from
Mar 8, 2019
Merged

Update images and enable leak detection, and split tests in CI to Unit, Integration and Web #299

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d23c337
update images
pawelchcki Feb 15, 2019
3446bd2
make env setting work
pawelchcki Feb 15, 2019
3caa75a
Support MUSL compilation of backtrace.c
pawelchcki Feb 19, 2019
2d6f501
update docker compose with latest alpine based images
pawelchcki Mar 6, 2019
5ac2580
update to latest images
pawelchcki Mar 6, 2019
8c78337
make modular config
pawelchcki Mar 7, 2019
ac42b8a
update config schema to match new CIRCLECI reqs
pawelchcki Mar 7, 2019
9df17ca
Fix Curl tests and disable composer tls everywhere
pawelchcki Mar 7, 2019
1bd2c78
use the same images everywhere
pawelchcki Mar 7, 2019
9d4faa5
switch to image tag for unit tests
pawelchcki Mar 7, 2019
816a0e2
use old image for 7.2 integrations tests (where is mcrypt? )
pawelchcki Mar 7, 2019
5bbaf12
web 5.6 is dying in debug mode
pawelchcki Mar 7, 2019
57c2035
add 1 test debug zts build
pawelchcki Mar 7, 2019
aa489d0
disable zts for now
pawelchcki Mar 7, 2019
70dacac
Make integration tests steps more explicit, name jobs longer names
pawelchcki Mar 8, 2019
08ec603
Maybe official mongo will be better ?
pawelchcki Mar 8, 2019
4df2f8e
mongo small files
pawelchcki Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
412 changes: 167 additions & 245 deletions .circleci/config.yml
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,22 @@ x-aliases:
- .scenarios.lock:/home/circleci/app/.scenarios.lock

services:
'5.4-debug': { <<: *base_php_service, build: 'dockerfiles/debug_php-5.4' }
'5.4-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-5.4-debug' }
'5.4': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_php_5_4' }
'5.6': { <<: *base_56_service, image: 'datadog/docker-library:ddtrace_php_5_6' }
'5.6-zts': { <<: *base_56_service, image: 'circleci/php:5.6-zts' }
'5.6-debug': { <<: *base_56_service, build: 'dockerfiles/debug_php-5.6' }
'5.6-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-5.6-debug' }
'5.6-zts': { <<: *base_56_service, image: 'datadog/docker-library:ddtrace_alpine_php-5.6-zts' }
'7.0': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_php_7_0' }
'7.0-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-7.0-debug' }
'7.1': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_php_7_1' }
'7.1-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-7.1-debug' }
'ubuntu-16.04-7.1': { <<: *base_php_service, build: 'dockerfiles/ubuntu-16.04-php-7.1' }
'ubuntu-18.04-7.2': { <<: *base_php_service, build: 'dockerfiles/ubuntu-18.04-php-7.2' }
'7.2': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_php_7_2' }
'7.2-debug': { <<: *base_php_service, build: 'dockerfiles/debug_php-7.2' }
'7.2-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-7.2-debug' }
'7.1-centos-compiled': { <<: *base_php_service, build: 'dockerfiles/verify_packages/centos7-compiled' }

'7.3-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-7.3-debug' }
'7.3-zts-debug': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_alpine_php-7.3-zts-debug' }
'fpm': { <<: *base_php_service, image: 'circleci/ruby:2.5', depends_on: [] }

mysql_integration:
Expand Down
90 changes: 0 additions & 90 deletions dockerfiles/debug_php-5.4/Dockerfile
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions dockerfiles/debug_php-5.6/Dockerfile
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions dockerfiles/debug_php-7.2/Dockerfile
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions dockerfiles/php-5.4/Dockerfile
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions src/ext/backtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if defined(__GLIBC__) || defined(__APPLE__)
#include <execinfo.h>
#include <php.h>
#include <signal.h>
Expand Down Expand Up @@ -49,3 +50,10 @@ void ddtrace_install_backtrace_handler(TSRMLS_D) {
handler_installed = 1;
}
}
#else
void ddtrace_install_backtrace_handler(TSRMLS_D) {
#ifdef ZTS
UNUSED(TSRML_C);
#endif // ZTS
}
#endif // GLIBC
2 changes: 2 additions & 0 deletions src/ext/backtrace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#ifndef DD_BACKTRACE_H
#define DD_BACKTRACE_H
#define MAX_STACK_SIZE 1024
#if defined(__GLIBC__) || defined(__APPLE__)
void ddtrace_backtrace_handler(int sig);
#endif
void ddtrace_install_backtrace_handler(TSRMLS_D);

#endif // DD_BACKTRACE_H
Loading