Skip to content

Commit

Permalink
20230329 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 37e013c commit 158f961
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"require-dev": {
"phpunit/phpunit": ">=5.7.28",
"php-coveralls/php-coveralls": "^2.1 || ^1.1",
"phpunit/phpcov": "^3.0 || ^2.0"
"phpunit/phpcov": "^4.0 || ^3.0 || ^2.0"
}
}
4 changes: 4 additions & 0 deletions tests/composer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ if [ "$Composer" = "1" ]; then
echo "supported. Would install on CI."
fi
px="$ph $pu.phar"
if [ "$PHVM" == "5" ] && [ "$PHVm" == "3" ]; then # Issue #155
$px config --global disable-tls true
$px config --global secure-http false
fi
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 @@ -186,13 +186,13 @@ ADODl=archive
ADOFilePfx=v
ADOFileSfx=.tar.gz
if [ "$pvM" \> "7" ]; then # PHP 8x
ADODBVer=5.20.17
ADODBVer=5.20.18
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.15
ADODBVer=5.20.16
elif [ "$pvm" \> "1" ]; then # PHP 7.2+
ADODBVer=5.20.13
else
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.14
ADODBVer=5.15
else
ADODBVer=5.01beta
fi
Expand Down

0 comments on commit 158f961

Please sign in to comment.