public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Continue implementing Alpine support 

Test: interbase, mcrypt, mssql, -STOP-
pull/56/head
Michele Locati 2019-12-11 12:57:53 +01:00
parent 3202a0f193
commit 5c41352402
No known key found for this signature in database
GPG Key ID: 98B7CE2E7234E28B
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -150,6 +150,14 @@ Some extension has special requirements:
Test: gd, zip Test: gd, zip
``` ```
If your pull request contains multiple commits, we'll check the "Test:" message of every commit.
If you want to stop parsing next commits, add `-STOP-` in the "Test:" line, for example:
```
Improve the GD and ZIP extensions
Test: gd, zip, -STOP-
```
## Do you want to really say thank you? ## Do you want to really say thank you?

1
data/supported-extensions
View File

@ -20,6 +20,7 @@ mcrypt 5.6 7.0 7.1 7.2 7.3 7.4
memcache 5.6 memcache 5.6
memcached 5.6 7.0 7.1 7.2 7.3 7.4 memcached 5.6 7.0 7.1 7.2 7.3 7.4
msgpack 5.6 7.0 7.1 7.2 7.3 7.4 msgpack 5.6 7.0 7.1 7.2 7.3 7.4
mssql 5.6
mysql 5.6 mysql 5.6
mysqli 5.6 7.0 7.1 7.2 7.3 7.4 mysqli 5.6 7.0 7.1 7.2 7.3 7.4
odbc 5.6 7.0 7.1 7.2 7.3 7.4 odbc 5.6 7.0 7.1 7.2 7.3 7.4

10
install-php-extensions
View File

@ -296,7 +296,7 @@ buildRequiredPackageLists () {
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libldap2-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libldap2-dev"
;; ;;
mcrypt@alpine) mcrypt@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libmcrypt" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $PHPIZE_DEPS libmcrypt"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libmcrypt-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libmcrypt-dev"
;; ;;
mcrypt@debian) mcrypt@debian)
@ -320,7 +320,12 @@ buildRequiredPackageLists () {
msgpack@alpine) msgpack@alpine)
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS"
;; ;;
mssql@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent freetds"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev"
;;
mssql@debian) mssql@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsybdb5"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev"
;; ;;
odbc@debian) odbc@debian)
@ -527,9 +532,8 @@ installBundledModule () {
cd /tmp/src/firebird cd /tmp/src/firebird
#Patch rwlock.h (this has been fixed in later release of firebird 3.x) #Patch rwlock.h (this has been fixed in later release of firebird 3.x)
sed -i '194s/.*/#if 0/' src/common/classes/rwlock.h sed -i '194s/.*/#if 0/' src/common/classes/rwlock.h
set +x
./configure --with-system-icu ./configure --with-system-icu
make -j$(nproc) btyacc_binary gpre_boot libfbstatic libfbclient make -s btyacc_binary gpre_boot libfbstatic libfbclient
cp gen/firebird/lib/libfbclient.so /usr/lib/ cp gen/firebird/lib/libfbclient.so /usr/lib/
ln -s /usr/lib/libfbclient.so /usr/lib/libfbclient.so.2 ln -s /usr/lib/libfbclient.so /usr/lib/libfbclient.so.2
cd - cd -

12
scripts/travisci-test-extensions
View File

@ -156,6 +156,9 @@ getAllPHPVersionsFor () {
# Arguments: # Arguments:
# $1: the commit hash # $1: the commit hash
# #
# Set:
# STOP_NEXT_COMMITS to 1 if we should skip next commits
#
# Return: # Return:
# 0 (true): if test passes # 0 (true): if test passes
# 1 (false): if test fails # 1 (false): if test fails
@ -186,7 +189,9 @@ testExtensionsFromMessage () {
if test -n "$TESTLIST"; then if test -n "$TESTLIST"; then
IFS=' ,;' IFS=' ,;'
for COMMIT_LINE_EXT in $TESTLIST; do for COMMIT_LINE_EXT in $TESTLIST; do
if test -z "$TEST_EXTENSIONS"; then if test $COMMIT_LINE_EXT = '-STOP-'; then
STOP_NEXT_COMMITS=1
elif test -z "$TEST_EXTENSIONS"; then
TEST_EXTENSIONS=$COMMIT_LINE_EXT; TEST_EXTENSIONS=$COMMIT_LINE_EXT;
else else
if ! stringInList "$COMMIT_LINE_EXT" "$TEST_EXTENSIONS"; then if ! stringInList "$COMMIT_LINE_EXT" "$TEST_EXTENSIONS"; then
@ -210,7 +215,7 @@ testExtensionsFromMessage () {
return $testExtensionsFromMessage_result return $testExtensionsFromMessage_result
} }
STOP_NEXT_COMMITS=0
TESTS_RESULTS=0 TESTS_RESULTS=0
ADDED_EXTENSION_LINE= ADDED_EXTENSION_LINE=
FOUND_ATAT= FOUND_ATAT=
@ -239,6 +244,9 @@ for COMMIT_HASH in $(git -C "${TRAVIS_BUILD_DIR}" log --pretty='format:%H' "${TR
if ! testExtensionsFromMessage "$COMMIT_HASH"; then if ! testExtensionsFromMessage "$COMMIT_HASH"; then
TESTS_RESULTS=1 TESTS_RESULTS=1
fi fi
if test $STOP_NEXT_COMMITS -eq 1; then
break
fi
done done
if test ${TESTS_RESULTS} -ne 0; then if test ${TESTS_RESULTS} -ne 0; then