From b05f7d04160105aee6f0412cf61ad607c7086f2b Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Mon, 6 Nov 2023 17:04:13 +0100 Subject: [PATCH 1/2] Update extensions: igbinary, ssh2, yaml - igbinary 3.2.12 to 3.2.14 - ssh2 1.3.1 to 1.4 - yaml 2.2.2 to 2.2.3 --- .../opt/flownative/php/build/extensions/igbinary/igbinary.sh | 2 +- root-files/opt/flownative/php/build/extensions/ssh2/ssh2.sh | 2 +- root-files/opt/flownative/php/build/extensions/yaml/yaml.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/root-files/opt/flownative/php/build/extensions/igbinary/igbinary.sh b/root-files/opt/flownative/php/build/extensions/igbinary/igbinary.sh index eedf8a6..18bc11c 100644 --- a/root-files/opt/flownative/php/build/extensions/igbinary/igbinary.sh +++ b/root-files/opt/flownative/php/build/extensions/igbinary/igbinary.sh @@ -35,7 +35,7 @@ extensions_igbinary_runtime_packages() { # @return string # extensions_igbinary_url() { - echo "https://github.com/igbinary/igbinary/archive/refs/tags/3.2.12.tar.gz" + echo "https://github.com/igbinary/igbinary/archive/refs/tags/3.2.14.tar.gz" } # --------------------------------------------------------------------------------------- diff --git a/root-files/opt/flownative/php/build/extensions/ssh2/ssh2.sh b/root-files/opt/flownative/php/build/extensions/ssh2/ssh2.sh index 1296cd1..2b3fa34 100644 --- a/root-files/opt/flownative/php/build/extensions/ssh2/ssh2.sh +++ b/root-files/opt/flownative/php/build/extensions/ssh2/ssh2.sh @@ -37,7 +37,7 @@ extensions_ssh2_runtime_packages() { # @return string # extensions_ssh2_url() { - echo "https://pecl.php.net/get/ssh2-1.3.1.tgz" + echo "https://pecl.php.net/get/ssh2-1.4.tgz" } # --------------------------------------------------------------------------------------- diff --git a/root-files/opt/flownative/php/build/extensions/yaml/yaml.sh b/root-files/opt/flownative/php/build/extensions/yaml/yaml.sh index 8c00b5f..d97ed06 100644 --- a/root-files/opt/flownative/php/build/extensions/yaml/yaml.sh +++ b/root-files/opt/flownative/php/build/extensions/yaml/yaml.sh @@ -39,7 +39,7 @@ extensions_yaml_runtime_packages() { # @return string # extensions_yaml_url() { - echo "http://pecl.php.net/get/yaml-2.2.2.tgz" + echo "http://pecl.php.net/get/yaml-2.2.3.tgz" } # --------------------------------------------------------------------------------------- From e1ef6802467956c32f100ea2bf7eba5fbc823807 Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Mon, 6 Nov 2023 17:02:42 +0100 Subject: [PATCH 2/2] Allow to build PHP 8.3 using 8.3.0RC5 --- .github/workflows/docker.build.yaml | 2 +- root-files/build.sh | 11 ++++++++--- .../flownative/php/build/extensions/xdebug/xdebug.sh | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml index 6476b64..a7cf6ab 100644 --- a/.github/workflows/docker.build.yaml +++ b/.github/workflows/docker.build.yaml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - php: [ 7.4.33, 8.0.30, 8.1.25, 8.2.12 ] + php: [ 7.4.33, 8.0.30, 8.1.25, 8.2.12, 8.3.0RC5 ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/root-files/build.sh b/root-files/build.sh index fbdfbf5..7dffef4 100755 --- a/root-files/build.sh +++ b/root-files/build.sh @@ -117,7 +117,12 @@ build_get_unnecessary_packages() { build_compile_php() { local php_source_url - php_source_url="https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz" + if [[ "${PHP_VERSION}" =~ ^8.3 ]]; then + php_source_url="https://downloads.php.net/~jakub/php-${PHP_VERSION}.tar.gz" + else + php_source_url="https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz" + fi + info "🛠 Downloading source code for PHP ${PHP_VERSION} from ${php_source_url} ..." with_backoff "curl -sSL ${php_source_url} -o php.tar.gz" "15" || ( error "Failed downloading PHP source from ${php_source_url}" @@ -178,7 +183,7 @@ build_compile_php() { --with-bz2 \ --without-pear \ >$(debug_device) - elif [[ "${PHP_VERSION}" =~ ^8.[0-2] ]]; then + elif [[ "${PHP_VERSION}" =~ ^8.[0-3] ]]; then ./configure \ --prefix=${PHP_BASE_PATH} \ --with-config-file-path="${PHP_BASE_PATH}/etc" \ @@ -432,7 +437,7 @@ case $1 in init) banner_flownative 'PHP' - if [[ ! "${PHP_VERSION}" =~ ^7.[1-4]|^8.[0-2] ]]; then + if [[ ! "${PHP_VERSION}" =~ ^7.4|^8.[0-3] ]]; then error "🛠 Unsupported PHP version '${PHP_VERSION}'" exit 1 fi diff --git a/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh b/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh index 844b51a..34cb32e 100644 --- a/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh +++ b/root-files/opt/flownative/php/build/extensions/xdebug/xdebug.sh @@ -38,8 +38,10 @@ extensions_xdebug_runtime_packages() { # @return string # extensions_xdebug_url() { - if [[ "${PHP_VERSION}" =~ ^8.2 ]]; then - echo "https://xdebug.org/files/xdebug-3.2.0.tgz" + if [[ "${PHP_VERSION}" =~ ^8.3 ]]; then + echo "https://github.com/xdebug/xdebug/archive/refs/heads/master.tar.gz" + elif [[ "${PHP_VERSION}" =~ ^8.2 ]]; then + echo "https://xdebug.org/files/xdebug-3.2.2.tgz" elif [[ "${PHP_VERSION}" =~ ^8 ]]; then echo "https://xdebug.org/files/xdebug-3.1.6.tgz" else