com web/gcov: swap PHP 5.5 for 7.1 do a git reset before pull to avoid failures: cron/cron.sh cron/tags.inc
| From: | Nuno Lopes | Date: | Sun, 28 Aug 2016 18:50:41 +0000 |
| Subject: | com web/gcov: swap PHP 5.5 for 7.1 do a git reset before pull to avoid failures: cron/cron.sh cron/tags.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-25086@lists.php.net to get a copy of this message | ||
Commit: 772f05432b87162565378b5995a1075622c46b80
Author: Nuno Lopes <nlopess@php.net> Sun, 28 Aug 2016 14:50:41 -0400
Parents: 664f8ace78c973aa8f0064ed84689d660785acee
Branches: master
Link: http://git.php.net/?p=web/gcov.git;a=commitdiff;h=772f05432b87162565378b5995a1075622c46b80
Log:
swap PHP 5.5 for 7.1
do a git reset before pull to avoid failures
Changed paths:
M cron/cron.sh
M cron/tags.inc
Diff:
diff --git a/cron/cron.sh b/cron/cron.sh
index eb1e244..b667465 100755
--- a/cron/cron.sh
+++ b/cron/cron.sh
@@ -103,12 +103,14 @@ do
cd ${PHPROOT}
if [ -d ${PHPTAG} ]; then
cd ${PHPTAG}
+ git reset --hard
git pull
else
git clone http://git.php.net/repository/php-src.git -b
$GITBRANCH $PHPTAG
cd ${PHPTAG}
fi
../vcsclean
+ git clean -xfd > /dev/null
cp "../config.$PHPTAG" config.nice
if [ "${PHPTAG}" = "PHP_5_3" ]; then
diff --git a/cron/tags.inc b/cron/tags.inc
index 031b0ac..883d7bc 100644
--- a/cron/tags.inc
+++ b/cron/tags.inc
@@ -1,4 +1,4 @@
-PHP_5_4
-PHP_5_5
-PHP_5_6
PHP_HEAD
+PHP_7_1
+PHP_7_0
+PHP_5_6