Skip to content

Commit

Permalink
20230329 Fix CI build breakage. 2
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 0013a9c commit 37e013c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 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.38",
"phpunit/phpunit": ">=5.7.28",
"php-coveralls/php-coveralls": "^2.1 || ^1.1",
"phpunit/phpcov": "^3.0 || ^2.0"
}
Expand Down
10 changes: 5 additions & 5 deletions tests/composer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ echo -n "PHP Composer install "
if [ "$Composer" = "1" ]; then
if [ "$TRAVIS" == "true" ]; then # Only install on travis
echo "started."
# echo "Download"
curl -s http://getcomposer.org/installer | $ph
# $ph -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
# echo "Setup"
# $ph composer-setup.php --disable-tls --2
echo "Download"
# curl -s http://getcomposer.org/installer | $ph
$ph -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
echo "Setup"
$ph composer-setup.php --disable-tls --2
else
echo "supported. Would install on CI."
fi
Expand Down
16 changes: 8 additions & 8 deletions tests/setupenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,16 @@ if [ "$Composer" \< "1" ]; then # Can we install it?
if [ "$TRAVIS" == "true" ]; then
if [ "$Composer" \> "0" ]; then
export COMPOSER_MEMORY_LIMIT=2G
if [ "$pvM" == "5" ] && [ "$pvm" == "3" ]; then
# if [ "$pvM" == "5" ] && [ "$pvm" == "3" ]; then
# Update CA Bundle on PHP 5.3x Issue #155
# Add Ubuntu Trusty repo.
# sudo add-apt-repository -y deb http://us.archive.ubuntu.com/ubuntu/ trusty
# sudo apt-get -q update
# sudo apt-get install apt-transport-https ca-certificates -y
# sudo apt-get install ca-certificates -y
sudo rm /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt
sudo update-ca-certificates
fi
# sudo rm /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt
# sudo update-ca-certificates
# fi
if [ "$SafeMode" == "1" ]; then # Safe mode.
# Install composer.
export Composer=1
Expand Down Expand Up @@ -186,15 +186,15 @@ ADODl=archive
ADOFilePfx=v
ADOFileSfx=.tar.gz
if [ "$pvM" \> "7" ]; then # PHP 8x
ADODBVer=5.20.16
ADODBVer=5.20.17
if [ "$1" == "" ] && [ "$TRAVIS" == "true" ]; then
ADODBPATH="ADOdb-$ADODBVer"
fi
elif [ "$pvM" \> "5" ]; then # PHP 7x
if [ "$pvm" \> "2" ]; then # PHP 7.3+
ADODBVer=5.20.14
ADODBVer=5.20.15
elif [ "$pvm" \> "1" ]; then # PHP 7.2+
ADODBVer=5.20.12
ADODBVer=5.20.13
else
ADODBVer=5.20.0
fi
Expand All @@ -203,7 +203,7 @@ elif [ "$pvM" \> "5" ]; then # PHP 7x
fi
elif [ "$pvM" \> "4" ]; then # PHP 5x
if [ "$pvm" \> "2" ]; then # PHP 5.3+
ADODBVer=5.13
ADODBVer=5.14
else
ADODBVer=5.01beta
fi
Expand Down

0 comments on commit 37e013c

Please sign in to comment.