-
-
Notifications
You must be signed in to change notification settings - Fork 117
Build for PHP 8.4 and update libraries #578
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
Changes from all commits
e0b90e7
1f6296c
6957480
a21f889
c846503
ce1f4ff
024b735
6512ca7
b3a2689
fd9c6fa
8555be0
7569054
1656f0c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,8 @@ RUN mkdir -p ${AMQP_BUILD_DIR} | |
|
||
# Compile rabbitmq | ||
WORKDIR ${AMQP_BUILD_DIR} | ||
# Currently it is not possible to use newer rabbitmq-c version than 0.13.0 because this is | ||
# last version which supports CMake 3.17 which is latest available version in Amazon Linux 2. | ||
RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.13.0.tar.gz | ||
RUN tar xzf rabbitmq-c.tar.gz | ||
WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0 | ||
|
@@ -19,7 +21,7 @@ RUN cmake --build . --target install | |
WORKDIR ${AMQP_BUILD_DIR} | ||
RUN git clone https://github.com/php-amqp/php-amqp | ||
WORKDIR ${AMQP_BUILD_DIR}/php-amqp | ||
RUN git reset --hard 618e06ad2ef867598831cdd3faadba0dd65be917 | ||
RUN git checkout v2.1.2 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you explain this change? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This commit referenced php-amqp/php-amqp@618e06a, a fix for PHP 8.1. I assume this was needed back then when this commit was not tagged yet. Tag v2.1.2 is from Jan 22, 2024 and this fix is already contained in it. So this is basically an update of php-amqp source to latest release. |
||
RUN phpize | ||
RUN ./configure | ||
RUN make -j $(nproc) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,15 +7,15 @@ ENV DDTRACE_BUILD_DIR=${BUILD_DIR}/ddtrace | |
RUN set -xe; \ | ||
mkdir -p ${DDTRACE_BUILD_DIR}; \ | ||
curl -Ls -o ${DDTRACE_BUILD_DIR}/datadog-setup.php \ | ||
https://github.com/DataDog/dd-trace-php/releases/download/0.96.0/datadog-setup.php | ||
https://github.com/DataDog/dd-trace-php/releases/download/1.5.1/datadog-setup.php | ||
|
||
WORKDIR ${DDTRACE_BUILD_DIR} | ||
|
||
RUN php datadog-setup.php --php-bin=all --enable-profiling | ||
|
||
RUN cp "$(php-config --extension-dir)/ddtrace.so" /tmp/ddtrace.so && \ | ||
cp "$(php-config --extension-dir)/datadog-profiling.so" /tmp/datadog-profiling.so && \ | ||
cp "$(php-config --ini-dir)/98-ddtrace.ini" /tmp/ext.ini | ||
cp "$(php-config --ini-dir | cut -d: -f1)/98-ddtrace.ini" /tmp/ext.ini | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you explain this change? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
|
||
RUN sed -i 's/extension = ddtrace\.so/extension = \/opt\/bref-extra\/ddtrace.so/' /tmp/ext.ini && \ | ||
sed -i 's/extension = datadog-profiling\.so/extension = \/opt\/bref-extra\/datadog-profiling.so/' /tmp/ext.ini && \ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
"php": [ | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,27 +10,28 @@ ENV ORACLE_BUILD_DIR=${BUILD_DIR}/oracle | |
# Install libaio | ||
RUN yum install -y libaio | ||
|
||
# Instant Client newer than 21.x requires glibc 2.28+ which is not available on Amazon Linux 2 | ||
RUN mkdir -p ${ORACLE_BUILD_DIR}; \ | ||
cd ${ORACLE_BUILD_DIR}; \ | ||
curl -o oci-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2110000/instantclient-basiclite-linux.x64-21.10.0.0.0dbru.zip && \ | ||
unzip oci-basic.zip -d src && \ | ||
curl -o oci-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2110000/instantclient-sdk-linux.x64-21.10.0.0.0dbru.zip && \ | ||
unzip oci-sdk.zip -d src | ||
curl -o oci-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basiclite-linux.x64-21.16.0.0.0dbru.zip && \ | ||
unzip oci-basic.zip -d src -x META-INF/* && \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you explain this change? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
curl -o oci-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip && \ | ||
unzip oci-sdk.zip -d src -x META-INF/* | ||
|
||
RUN if [ "$PHP_VERSION" = "80" ] ; then \ | ||
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8-3.0.1; \ | ||
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8-3.0.1; \ | ||
elif [ "$PHP_VERSION" = "81" ] ; then \ | ||
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8-3.2.1; \ | ||
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8-3.2.1; \ | ||
else \ | ||
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8; \ | ||
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8; \ | ||
fi | ||
|
||
RUN cp /usr/lib64/libaio.so.1 /tmp/libaio.so.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libclntshcore.so.21.1 /tmp/libclntshcore.so.21.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libclntsh.so.21.1 /tmp/libclntsh.so.21.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libocci.so.21.1 /tmp/libocci.so.21.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libnnz21.so /tmp/libnnz21.so | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libociicus.so /tmp/libociicus.so | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libclntshcore.so.21.1 /tmp/libclntshcore.so.21.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libclntsh.so.21.1 /tmp/libclntsh.so.21.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libocci.so.21.1 /tmp/libocci.so.21.1 | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libnnz21.so /tmp/libnnz21.so | ||
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libociicus.so /tmp/libociicus.so | ||
RUN cp `php-config --extension-dir`/oci8.so /tmp/oci8.so | ||
RUN echo 'extension=oci8.so' > /tmp/ext.ini | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"80", | ||
"81", | ||
"82", | ||
"83" | ||
"83", | ||
"84" | ||
] | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This likely broke the blackfire.yml workflow: https://github.com/brefphp/extra-php-extensions/actions/runs/13669368623/job/38216533337
The “Publish” step fails with:
which is likely due to
symfony/http-client
being pinned to 5.3.8 in composer.json.