update for PHP-8

[m6w6/travis-pecl] / Makefile

diff --git a/Makefile b/Makefile
index d7d70cd3b459f53d4ce4c93780521b2e43da83a2..4a903a800030c45581df06f9fd58e99cff648477 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 export
 
-PHP ?= 7.3
+PHP ?= 7.4
 JOBS ?= 2
 PHP_MIRROR ?= https://php.net/distributions/
 TMPDIR ?= /tmp
@@ -62,6 +62,7 @@ versions: $(PHP_RELEASES)
 
 $(PHP_RELEASES): $(makdir)/php-version-url-dist.php $(makdir)/php-version-url-qa.php | $(srcdir)
        cd $(makdir) && printf "master\tmaster\t%s/fetch-master.sh\n" $$(pwd) >$@
+       curl -sSL "https://php.net/releases/index.php?json&version=8&max=-1" | $(makdir)/php-version-url-dist.php >>$@
        curl -sSL "https://php.net/releases/index.php?json&version=7&max=-1" | $(makdir)/php-version-url-dist.php >>$@
        curl -sSL "https://php.net/releases/index.php?json&version=5&max=-1" | $(makdir)/php-version-url-dist.php >>$@
        curl -sSL "https://qa.php.net/api.php?type=qa-releases&format=json"  | $(makdir)/php-version-url-qa.php   >>$@
@@ -130,8 +131,7 @@ $(PECL_DIR)/config.m4:
                        cd $(PECL_DIR); \
                        git pull; \
                else \
-                       git clone -b $(PECL_VERSION) \
-                               $$(dirname $$(git remote get-url $$(git remote)))/$(PECL_EXTENSION) $(PECL_DIR); \
+                       git clone https://github.com/$(PECL_EXTENSION) $(PECL_DIR); \
                fi; \
        else \
                mkdir -p $(PECL_DIR); \
@@ -166,9 +166,14 @@ ext: pecl-check pecl
        $(makdir)/check-packagexml.php package.xml
 
 .PHONY: test
+test: TESTS ?= tests
 test: php
-       REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff tests
-
+       REPORT_EXIT_STATUS=1 $(bindir)/php run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(TESTS)
+.PHONY: pecl-test
+pecl-test: TESTS ?= $(PECL_DIR)/tests
+pecl-test: php
+       REPORT_EXIT_STATUS=1 $(bindir)/php $(prefix)/lib/php/build/run-tests.php -q -p $(bindir)/php --set-timeout 300 --show-diff $(TESTS)
+       
 pharext/%: $(PECL_INI) php | $(srcdir)/../%.ext.phar
        for phar in $|; do $(bindir)/php $$phar --prefix=$(prefix) --ini=$(PECL_INI); done