Skip to content

Commit

Permalink
20230328 Fix CI build breakage. 3
Browse files Browse the repository at this point in the history
         Related Issue(s) #154 #155 #158 #159 #162
  • Loading branch information
NathanGibbs3 committed Mar 29, 2023
1 parent 6d407c9 commit 1dc2a76
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"pear/mail": ">=1.4.1"
},
"require-dev": {
"phpunit/phpunit": ">=4.8.36",
"phpunit/phpunit": ">=4.8.37",
"php-coveralls/php-coveralls": "^2.1 || ^1.1",
"phpunit/phpcov": "^2.0"
}
Expand Down
9 changes: 6 additions & 3 deletions tests/composer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ echo -n "PHP Composer install "
if [ "$Composer" = "1" ]; then
if [ "$TRAVIS" == "true" ]; then # Only install on travis
echo "started."
echo "Download"
$ph -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
$ph composer-setup.php --2
# curl -s http://getcomposer.org/installer | $ph
echo "Setup"
$ph composer-setup.php --disable-tls --2
else
echo "supported. Would install on CI."
fi
px="$ph $pu.phar"
px="$ph $pu.phar --disable-tls"
elif [ "$Composer" = "2" ]; then
echo "not necessary, using system."
px=$pu
Expand Down
6 changes: 3 additions & 3 deletions tests/setupenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ ADODl=archive
ADOFilePfx=v
ADOFileSfx=.tar.gz
if [ "$pvM" \> "7" ]; then # PHP 8x
ADODBVer=5.20.14
ADODBVer=5.20.15
if [ "$1" == "" ] && [ "$TRAVIS" == "true" ]; then
ADODBPATH="ADOdb-$ADODBVer"
fi
elif [ "$pvM" \> "5" ]; then # PHP 7x
if [ "$pvm" \> "3" ]; then # PHP 7.3+
if [ "$pvm" \> "2" ]; then # PHP 7.3+
ADODBVer=5.20.13
elif [ "$pvm" \> "1" ]; then # PHP 7.2+
ADODBVer=5.20.12
Expand All @@ -202,7 +202,7 @@ elif [ "$pvM" \> "5" ]; then # PHP 7x
fi
elif [ "$pvM" \> "4" ]; then # PHP 5x
if [ "$pvm" \> "2" ]; then # PHP 5.3+
ADODBVer=5.11
ADODBVer=5.12
else
ADODBVer=5.01beta
fi
Expand Down

0 comments on commit 1dc2a76

Please sign in to comment.