forked from mlocati/docker-php-extension-installer
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21 from mlocati/master
Fork Sync: Update from parent repository
- Loading branch information
Showing
7 changed files
with
121 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Check order supported extensions list | ||
| run: | | ||
| sort -o data/supported-extensions.sorted data/supported-extensions | ||
|
|
@@ -29,13 +29,14 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Install Go | ||
| uses: actions/setup-go@v2 | ||
| uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: "1.21.0" | ||
| cache: false | ||
| - name: Install shfmt | ||
| run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/[email protected] | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Check coding style | ||
| run: ./scripts/invoke-shfmt check | ||
| check_syntax_php: | ||
|
|
@@ -48,7 +49,7 @@ jobs: | |
| php-version: "7.4" | ||
| tools: composer | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - name: Install Composer dependencies | ||
| run: composer install --no-progress --classmap-authoritative | ||
| - name: Check coding style | ||
|
|
@@ -84,7 +85,7 @@ jobs: | |
| IPETEST_DOCKER_DISTRO: ${{ matrix.distro }} | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Test extensions | ||
|
|
@@ -98,7 +99,7 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - run: docker run --rm --volume "$(pwd):/app" --workdir /app php:8.2-bullseye ./scripts/test-restore-apt | ||
| test_custom_version: | ||
| name: Test installing specific versions | ||
|
|
@@ -118,7 +119,7 @@ jobs: | |
| - ^2.8@stable | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - run: docker run --rm --volume "$(pwd):/app" --workdir /app php:7.4-alpine ./scripts/test-installversion "${{ matrix.xdebug_version }}" | ||
| test_composer: | ||
| name: Test installing composer | ||
|
|
@@ -135,7 +136,7 @@ jobs: | |
| - '2.0.1' | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - run: | | ||
| docker run --rm --volume "$(pwd):/app" --workdir /app php:7.4-alpine ./scripts/test-installcomposer "${{ matrix.composer_version }}" | ||
| test_marking_packages: | ||
|
|
@@ -152,7 +153,7 @@ jobs: | |
| - buster | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| - run: docker run --rm --volume "$(pwd):/app" --workdir /app "php:7.4-${{ matrix.distro }}" "./scripts/ci-markused-${{ matrix.distro }}" | ||
| test_instantclient_basic: | ||
| name: Test using Oracle Instant Client Basic | ||
|
|
@@ -164,7 +165,7 @@ jobs: | |
| container: php:8.1-cli-alpine | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - run: IPE_INSTANTCLIENT_BASIC=1 ./install-php-extensions oci8 pdo_oci | ||
| test_install_fromsource: | ||
| name: Test installing from source | ||
|
|
@@ -192,7 +193,7 @@ jobs: | |
| source: php-memcached-dev/[email protected] | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - run: ./install-php-extensions ${{ matrix.source }} | ||
| test_upgrading_icu_data_en: | ||
| name: Test that icu-data-en can be upgraded | ||
|
|
@@ -203,5 +204,5 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - run: docker run --rm --volume "$(pwd):/app" --workdir /app php:8.2-cli-alpine ./scripts/test-icu-data-en-upgradable | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1354,6 +1354,9 @@ buildRequiredPackageLists() { | |
| if test $PHP_MAJMIN_VERSION -ge 702; then | ||
| buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent c-ares" | ||
| buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile c-ares-dev" | ||
| if test $PHP_MAJMIN_VERSION -ge 801; then | ||
| buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile sqlite-dev" | ||
| fi | ||
| fi | ||
| ;; | ||
| swoole@debian) | ||
|
|
@@ -1362,9 +1365,13 @@ buildRequiredPackageLists() { | |
| if test $PHP_MAJMIN_VERSION -ge 702; then | ||
| buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libc-ares2" | ||
| buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libc-ares-dev" | ||
| fi | ||
| if test $PHP_MAJMIN_VERSION -ge 800; then | ||
| buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev" | ||
| if test $PHP_MAJMIN_VERSION -ge 800; then | ||
| buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libbrotli1" | ||
| buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev libbrotli-dev" | ||
| if test $PHP_MAJMIN_VERSION -ge 801; then | ||
| buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libsqlite3-dev" | ||
| fi | ||
| fi | ||
| fi | ||
| ;; | ||
| sybase_ct@alpine) | ||
|
|
@@ -2446,6 +2453,12 @@ installNewRelic() { | |
| NR_INSTALL_USE_CP_NOT_LN=1 NR_INSTALL_SILENT=1 ./newrelic-install install_daemon | ||
| ;; | ||
| esac | ||
| case "${IPE_NEWRELIC_KEEPLOG:-}" in | ||
| 1 | y* | Y*) ;; | ||
| *) | ||
| rm -f /tmp/nrinstall-*.tar | ||
| ;; | ||
| esac | ||
| cd - >/dev/null | ||
| cat <<EOT | ||
| NewRelic has been installed from $installNewRelic_url | ||
|
|
@@ -3811,6 +3824,21 @@ installRemoteModule() { | |
| elif test $PHP_BITS -eq 32; then | ||
| # See https://github.com/swoole/swoole-src/issues/5198#issuecomment-1820162178 | ||
| installRemoteModule_version="$(resolvePHPModuleVersion "$installRemoteModule_module" '^5.0')" | ||
| else | ||
| case "$DISTRO" in | ||
| alpine) | ||
| if test $DISTRO_MAJMIN_VERSION -le 312; then | ||
| installRemoteModule_version=5.1.2 | ||
| fi | ||
| ;; | ||
| esac | ||
| fi | ||
| if test -z "$installRemoteModule_version"; then | ||
| if test $PHP_MAJMIN_VERSION -le 800; then | ||
| installRemoteModule_version=5.1.3 | ||
| else | ||
| installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" stable)" | ||
| fi | ||
| fi | ||
| else | ||
| installRemoteModule_version="$(resolvePeclStabilityVersion "$installRemoteModule_module" "$installRemoteModule_version")" | ||
|
|
@@ -3823,19 +3851,85 @@ installRemoteModule() { | |
| installRemoteModule_openssl=yes | ||
| case "$DISTRO_VERSION" in | ||
| [email protected] | [email protected]) | ||
| if test -n "$installRemoteModule_version" && test $(compareVersions "$installRemoteModule_version" 4.6.0) -lt 0; then | ||
| if test $(compareVersions "$installRemoteModule_version" 4.6.0) -lt 0; then | ||
| # see https://github.com/swoole/swoole-src/issues/3934 | ||
| installRemoteModule_openssl=no | ||
| fi | ||
| ;; | ||
| esac | ||
| if test $PHP_MAJMIN_VERSION -eq 803; then | ||
| # see https://github.com/swoole/docker-swoole/issues/45 | ||
| if test $PHP_MAJMIN_VERSION -ge 800; then | ||
| # see https://github.com/swoole/swoole-src/issues/5365 | ||
| installRemoteModule_curl=no | ||
| else | ||
| installRemoteModule_curl=yes | ||
| fi | ||
| if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 5.0.1) -ge 0; then | ||
| if test $PHP_THREADSAFE -eq 1; then | ||
| installRemoteModule_zts=yes | ||
| else | ||
| installRemoteModule_zts=no | ||
| fi | ||
| installRemoteModule_sqlite=yes | ||
| case "$DISTRO" in | ||
| alpine) | ||
| if test $DISTRO_MAJMIN_VERSION -lt 317; then | ||
| # we need sqlite3 >= 3.7.7 | ||
| installRemoteModule_sqlite=no | ||
| fi | ||
| ;; | ||
| debian) | ||
| if test $DISTRO_MAJMIN_VERSION -lt 1200; then | ||
| # we need sqlite3 >= 3.7.7 | ||
| installRemoteModule_sqlite=no | ||
| fi | ||
| ;; | ||
| esac | ||
| if test $(compareVersions "$installRemoteModule_version" 6.0.0) -ge 0; then | ||
| # enable sockets supports? | ||
| addConfigureOption enable-sockets $installRemoteModule_sockets | ||
| # enable openssl support? | ||
| addConfigureOption enable-openssl $installRemoteModule_openssl | ||
| # enable mysqlnd support? | ||
| addConfigureOption enable-mysqlnd yes | ||
| # enable curl support? | ||
| addConfigureOption enable-swoole-curl $installRemoteModule_curl | ||
| # enable cares support? | ||
| addConfigureOption enable-cares yes | ||
| # enable brotli support? | ||
| addConfigureOption enable-brotli yes | ||
| # enable PostgreSQL database support? | ||
| addConfigureOption enable-swoole-pgsql yes | ||
| # enable ODBC database support? | ||
| addConfigureOption with-swoole-odbc no | ||
| # enable Oracle database support? | ||
| addConfigureOption with-swoole-oracle no | ||
| # enable Sqlite database support? | ||
| addConfigureOption enable-swoole-sqlite $installRemoteModule_sqlite | ||
| # enable swoole thread support (need php zts support)? | ||
| addConfigureOption enable-swoole-thread $installRemoteModule_zts | ||
| # enable iouring for file async support? | ||
| addConfigureOption enable-iouring yes | ||
| elif test $(compareVersions "$installRemoteModule_version" 5.1.0) -ge 0; then | ||
| # enable sockets supports? | ||
| addConfigureOption enable-sockets $installRemoteModule_sockets | ||
| # enable openssl support? | ||
| addConfigureOption enable-openssl $installRemoteModule_openssl | ||
| # enable mysqlnd support? | ||
| addConfigureOption enable-mysqlnd yes | ||
| # enable curl support? | ||
| addConfigureOption enable-swoole-curl $installRemoteModule_curl | ||
| # enable cares support? | ||
| addConfigureOption enable-cares yes | ||
| # enable brotli support? | ||
| addConfigureOption enable-brotli yes | ||
| # enable PostgreSQL database support? | ||
| addConfigureOption enable-swoole-pgsql yes | ||
| # enable ODBC database support? | ||
| addConfigureOption with-swoole-odbc no | ||
| # enable Oracle database support? | ||
| addConfigureOption with-swoole-oracle no | ||
| # enable Sqlite database support? | ||
| addConfigureOption enable-swoole-sqlite $installRemoteModule_sqlite | ||
| elif test $(compareVersions "$installRemoteModule_version" 5.0.1) -ge 0; then | ||
| # enable sockets supports? | ||
| addConfigureOption enable-sockets $installRemoteModule_sockets | ||
| # enable openssl support? | ||
|
|
||