Skip to content

Native packages with PHP 5.6 #122

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

Merged
pawelchcki merged 5 commits into from
Nov 15, 2018
Merged

Native packages with PHP 5.6 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47d81cc
PHP 5.6
pawelchcki Nov 15, 2018
02e1f69
remove zts build of php 5.6
pawelchcki Nov 15, 2018
26f3f47
add 5.6 zts build and verify 5.6 packages
pawelchcki Nov 15, 2018
e398baf
Fix zts compilation on php 5.6
pawelchcki Nov 15, 2018
6775588
5.6-zts docker compose
pawelchcki Nov 15, 2018
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
18 changes: 13 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,9 @@ jobs:
- <<: *IMAGE_DOCKER_REDIS
- <<: *IMAGE_DOCKER_MEMCHACED
- <<: *IMAGE_DOCKER_MYSQL

"7.0 20151012": &ARTIFACT_BUILD
"5.6 20131106": &ARTIFACT_BUILD
working_directory: ~/datadog
docker: [ image: 'circleci/php:7.0' ]
docker: [ image: 'circleci/php:5.6' ]
steps:
- checkout
- attach_workspace:
Expand All @@ -245,12 +244,18 @@ jobs:
- persist_to_workspace:
root: '.'
paths: ['./extensions']
"7.0 20151012":
<<: *ARTIFACT_BUILD
docker: [ image: 'circleci/php:7.0' ]
"7.1 20160303":
<<: *ARTIFACT_BUILD
docker: [ image: 'circleci/php:7.1' ]
"7.2 20170718":
<<: *ARTIFACT_BUILD
docker: [ image: 'circleci/php:7.2' ]
"5.6 zts 20131106-zts":
<<: *ARTIFACT_BUILD
docker: [ image: 'circleci/php:5.6-zts' ]
"7.0 zts 20151012-zts":
<<: *ARTIFACT_BUILD
docker: [ image: 'circleci/php:7.0-zts' ]
Expand Down Expand Up @@ -280,28 +285,31 @@ jobs:
name: Test installing packages on target systems
command: make -f dockerfiles/verify_packages/Makefile


workflows:
version: 2
build_packages:
jobs:
- "7.0 20151012": &BUILD_PACKAGE_FORKFLOW
- "5.6 20131106": &BUILD_PACKAGE_FORKFLOW
filters:
tags:
only: /(^build$)|(^[v]?[0-9]+(\.[0-9]+)*$)/
branches:
# Always build on master
ignore: /^(?!master$).*/
- "7.0 20151012": *BUILD_PACKAGE_FORKFLOW
- "7.1 20160303": *BUILD_PACKAGE_FORKFLOW
- "7.2 20170718": *BUILD_PACKAGE_FORKFLOW
- "5.6 zts 20131106-zts": *BUILD_PACKAGE_FORKFLOW
- "7.0 zts 20151012-zts": *BUILD_PACKAGE_FORKFLOW
- "7.1 zts 20160303-zts": *BUILD_PACKAGE_FORKFLOW
- "7.2 zts 20170718-zts": *BUILD_PACKAGE_FORKFLOW
- "package extension":
requires:
- "5.6 20131106"
- "7.0 20151012"
- "7.1 20160303"
- "7.2 20170718"
- "5.6 zts 20131106-zts"
- "7.0 zts 20151012-zts"
- "7.1 zts 20160303-zts"
- "7.2 zts 20170718-zts"
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ x-aliases:
services:
'5.4-debug': { <<: *base_php_service, build: 'dockerfiles/debug_php-5.4' }
'5.6': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_php_5_6' }
'5.6-zts': { <<: *base_php_service, image: 'circleci/php:5.6-zts' }
'5.6-debug': { <<: *base_php_service, build: 'dockerfiles/debug_php-5.6' }

'7.0': { <<: *base_php_service, image: 'datadog/docker-library:ddtrace_php_7_0' }
Expand Down
12 changes: 7 additions & 5 deletions dockerfiles/verify_packages/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
JESSIE_PHP_VERSIONS:=7.0.jessie 7.1.jessie 7.2.jessie
STRETCH_PHP_VERSIONS:=7.0.stretch 7.1.stretch 7.2.stretch
CENTOS6_PHP_VERSIONS=70.centos6 71.centos6
CENTOS7_PHP_VERSIONS=70.centos7 71.centos7 72.centos7
ALPINE_PHP_VERSIONS=7.0.alpine 7.1.alpine 7.2.alpine 7.0-zts.alpine 7.1-zts.alpine 7.2-zts.alpine
JESSIE_PHP_VERSIONS:=5.6.jessie 7.0.jessie 7.1.jessie 7.2.jessie
STRETCH_PHP_VERSIONS:=5.6.stretch 7.0.stretch 7.1.stretch 7.2.stretch
CENTOS6_PHP_VERSIONS=56.centos6 70.centos6 71.centos6
CENTOS7_PHP_VERSIONS=56.centos7 70.centos7 71.centos7 72.centos7
ALPINE_PHP_VERSIONS=5.6.alpine 7.0.alpine 7.1.alpine 7.2.alpine 5.6-zts.alpine 7.0-zts.alpine 7.1-zts.alpine 7.2-zts.alpine

.PHONY: $(JESSIE_PHP_VERSIONS) $(STRETCH_PHP_VERSIONS) $(CENTOS7_PHP_VERSIONS) $(ALPINE_PHP_VERSIONS) all

all: $(JESSIE_PHP_VERSIONS) $(CENTOS6_PHP_VERSIONS) $(CENTOS7_PHP_VERSIONS) $(ALPINE_PHP_VERSIONS)

5.6: 56.centos6 56.centos7 5.6.stretch 5.6.jessie 5.6.alpine 5.6-zts.alpine

$(JESSIE_PHP_VERSIONS): %.jessie:
@echo Building Debian Jessie - PHP $*
@docker build -t deb_jessie:$* --build-arg php_version=$* -f dockerfiles/verify_packages/debian_jessie/Dockerfile .
Expand Down
4 changes: 2 additions & 2 deletions src/ext/dispatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ static zend_always_inline zend_bool get_wrappable_function(zend_execute_data *ex
return 1;
}

static int update_opcode_leave(zend_execute_data *execute_data) {
static int update_opcode_leave(zend_execute_data *execute_data TSRMLS_DC) {
#if PHP_VERSION_ID < 70000
zend_vm_stack_clear_multiple(0 TSRMLS_CC);
EX(call)--;
Expand All @@ -294,7 +294,7 @@ int ddtrace_wrap_fcall(zend_execute_data *execute_data TSRMLS_DC) {

if (get_wrappable_function(execute_data, &fbc, &function_name, &function_name_length) &&
wrap_and_run(execute_data, fbc, function_name, function_name_length TSRMLS_CC)) {
return update_opcode_leave(execute_data);
return update_opcode_leave(execute_data TSRMLS_CC);
}

if (EX(opline)->opcode == ZEND_DO_FCALL_BY_NAME) {
Expand Down