Skip to content

Commit

Permalink
chore: EOL support for build and dist for PHP 5.x (#720)
Browse files Browse the repository at this point in the history
Support for PHP 5.x ended with v10.11.0.3 release. Therefore installer
script is updated to not install the agent on the system with PHP 5.x
now consider unsupported. Additionally build system is no longer capable
of generating artifacts for PHP 5.x. Moreover, to optimize build time,
the agent will no longer be built for PHP 5.x in the following
workflows:
- `code-coverage-baseline`
- `test-pull-request`
  • Loading branch information
mfulb authored Aug 29, 2023
1 parent 7d72a0b commit f255b1a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/code-coverage-baseline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
matrix:
platform: [gnu, musl]
arch: [amd64]
php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
include:
- codecov: 0
- platform: gnu
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
matrix:
platform: [gnu, musl]
arch: [amd64]
php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
include:
- codecov: 0
- platform: gnu
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/test-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ jobs:
matrix:
platform: [gnu, musl]
arch: [amd64, arm64]
php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
exclude:
- arch: arm64
php: '5.5'
- arch: arm64
php: '5.6'
- arch: arm64
php: '7.0'
- arch: arm64
Expand Down Expand Up @@ -121,7 +117,7 @@ jobs:
echo "AGENT_CHECK_VARIANT=check" >> $GITHUB_OUTPUT
elif [[ ${{ matrix.platform }} = 'gnu' ]]; then
echo "AGENT_CHECK_VARIANT=valgrind" >> $GITHUB_OUTPUT
elif [[ ${{matrix.php}} = '5.5' || ${{matrix.php}} = '5.6' || ${{matrix.php}} = '7.0' || ${{matrix.php}} = '7.1' ]]; then
elif [[ ${{matrix.php}} = '7.0' || ${{matrix.php}} = '7.1' ]]; then
echo "AGENT_CHECK_VARIANT=check" >> $GITHUB_OUTPUT
else
echo "AGENT_CHECK_VARIANT=valgrind" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -187,12 +183,8 @@ jobs:
matrix:
platform: [gnu, musl]
arch: [amd64, arm64]
php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
exclude:
- arch: arm64
php: '5.5'
- arch: arm64
php: '5.6'
- arch: arm64
php: '7.0'
- arch: arm64
Expand Down
33 changes: 3 additions & 30 deletions agent/newrelic-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,10 @@ check_file "${ilibdir}/scripts/newrelic.ini.template"
# MAKE SURE TO UPDATE THIS LIST WHENEVER SUPPORT IS ADDED OR REMOVED
# FOR A PHP VERSION
# Currently supported versions:
# (5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4)
# (7.0, 7.1, 7.2, 7.3, 7.4)
# for x64
if [ ${arch} = x64 ]; then
for pmv in "20121212" "20131226" "20151012" "20160303" "20170718" \
"20180731" "20190902"; do
for pmv in "20151012" "20160303" "20170718" "20180731" "20190902"; do
check_file "${ilibdir}/agent/${arch}/newrelic-${pmv}.so"
done
fi
Expand Down Expand Up @@ -536,8 +535,6 @@ add_to_path /usr/local/php
add_to_path /usr/local/php/bin
add_to_path /usr/local/zend/bin

add_to_path /usr/local/php-5.5/bin
add_to_path /usr/local/php-5.6/bin
add_to_path /usr/local/php-7.0/bin
add_to_path /usr/local/php-7.1/bin
add_to_path /usr/local/php-7.2/bin
Expand All @@ -550,8 +547,6 @@ add_to_path /usr/local/php-8.2/bin
add_to_path /opt/local/bin
add_to_path /usr/php/bin

add_to_path /usr/php-5.5/bin
add_to_path /usr/php-5.6/bin
add_to_path /usr/php-7.0/bin
add_to_path /usr/php-7.1/bin
add_to_path /usr/php-7.2/bin
Expand All @@ -561,8 +556,6 @@ add_to_path /usr/php-8.0/bin
add_to_path /usr/php-8.1/bin
add_to_path /usr/php-8.2/bin

add_to_path /usr/php/5.5/bin
add_to_path /usr/php/5.6/bin
add_to_path /usr/php/7.0/bin
add_to_path /usr/php/7.1/bin
add_to_path /usr/php/7.2/bin
Expand All @@ -575,8 +568,6 @@ add_to_path /usr/php/8.2/bin
add_to_path /opt/php/bin
add_to_path /opt/zend/bin

add_to_path /opt/php-5.5/bin
add_to_path /opt/php-5.6/bin
add_to_path /opt/php-7.0/bin
add_to_path /opt/php-7.1/bin
add_to_path /opt/php-7.2/bin
Expand Down Expand Up @@ -1042,23 +1033,7 @@ for this copy of PHP. We apologize for the inconvenience.
fi

case "${pi_ver}" in
5.5.*)
warning_message="${pdir}: deprecated php version '${pi_ver}'"
if [ -z "${NR_INSTALL_SILENT}" ]; then
echo $warning_message
fi
log $warning_message
;;

5.6.*)
warning_message="${pdir}: deprecated php version '${pi_ver}'"
if [ -z "${NR_INSTALL_SILENT}" ]; then
echo $warning_message
fi
log $warning_message
;;

7.0.*)
7.0.*)
;;

7.1.*)
Expand Down Expand Up @@ -1256,8 +1231,6 @@ does not exist. This particular instance of PHP will be skipped.
#
pi_modver=
case "${pi_ver}" in
5.5.*) pi_modver="20121212" ;;
5.6.*) pi_modver="20131226" ;;
7.0.*) pi_modver="20151012" ;;
7.1.*) pi_modver="20160303" ;;
7.2.*) pi_modver="20170718" ;;
Expand Down
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ _(most operating systems package these with `-dev` or `-devel` suffixes)_

### PHP

The PHP agent supports PHP versions `5.5`, `5.6`, `7.0`, `7.1`, `7.2`, `7.3`, `7.4`,`8.0`, and `8.1`.
The PHP agent supports PHP versions `7.0`, `7.1`, `7.2`, `7.3`, `7.4`,`8.0`, `8.1`, and `8.2`.

## Build the PHP Agent

Expand Down
2 changes: 1 addition & 1 deletion make/php_versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# SPDX-License-Identifier: Apache-2.0
#

PHP_VERSION_LIST=$${PHPS:-8.2 8.1 8.0 7.4 7.3 7.2 7.1 7.0 5.6 5.5}
PHP_VERSION_LIST=$${PHPS:-8.2 8.1 8.0 7.4 7.3 7.2 7.1 7.0}
2 changes: 0 additions & 2 deletions make/release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ $(eval $(call RELEASE_AGENT_TARGET,7.3,20180731))
$(eval $(call RELEASE_AGENT_TARGET,7.2,20170718))
$(eval $(call RELEASE_AGENT_TARGET,7.1,20160303))
$(eval $(call RELEASE_AGENT_TARGET,7.0,20151012))
$(eval $(call RELEASE_AGENT_TARGET,5.6,20131226))
$(eval $(call RELEASE_AGENT_TARGET,5.5,20121212))


#
Expand Down

0 comments on commit f255b1a

Please sign in to comment.