From 057aaf9fa7b576dda8b73eaec073d084157b78a4 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Tue, 18 Dec 2018 14:51:24 -0800 Subject: [PATCH] uses curl instead of wget --- .kokoro/docker/Dockerfile.template | 3 --- .kokoro/system_tests.sh | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.kokoro/docker/Dockerfile.template b/.kokoro/docker/Dockerfile.template index 080a4f954a..79068fc203 100644 --- a/.kokoro/docker/Dockerfile.template +++ b/.kokoro/docker/Dockerfile.template @@ -7,9 +7,6 @@ RUN apt-get update && apt-get install -y \ zlib1g-dev \ jq -RUN git clone https://github.com/GoogleCloudPlatform/php-tools.git ${HOME}/php-tools \ - && ${HOME}/php-tools/scripts/install_test_deps.sh - # install / enable PHP extensions RUN pecl install grpc \ && echo "extension=grpc.so" >> /opt/PHP_VERSION/lib/conf.d/ext-grpc.ini \ diff --git a/.kokoro/system_tests.sh b/.kokoro/system_tests.sh index ce3bd7c865..81bb66a8a3 100755 --- a/.kokoro/system_tests.sh +++ b/.kokoro/system_tests.sh @@ -44,12 +44,12 @@ mkdir -p build/logs export IS_PULL_REQUEST=$KOKORO_GITHUB_PULL_REQUEST_COMMIT -# Run tests -bash testing/run_test_suite.sh - -# Run code standards check on latest version of PHP +# Run code standards check when appropriate if [ "${RUN_CS_CHECK}" = "true" ]; then - wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -O php-cs-fixer \ + curl -L https://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -o php-cs-fixer \ && chmod a+x php-cs-fixer bash testing/run_cs_check.sh fi + +# Run tests +bash testing/run_test_suite.sh