Skip to content

Commit 6e56565

Browse files
author
Takashi Matsuo
committed
Merge pull request GoogleCloudPlatform#103 from GoogleCloudPlatform/use-php-tools
Use files from php-tools repo.
2 parents 314fb0b + 74e11be commit 6e56565

File tree

4 files changed

+7
-90
lines changed

4 files changed

+7
-90
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ env:
3030
global:
3131
- GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/credentials.json
3232
- GOOGLE_VERSION_ID=$TRAVIS_JOB_ID
33-
- PATH=${HOME}/gcloud/google-cloud-sdk/bin:${PATH}
33+
- PATH=${HOME}/google-cloud-sdk/bin:${PATH}
3434
- PHP_CGI_PATH=/home/travis/.phpenv/shims/php-cgi
3535
- TEST_BUILD_DIR=$TRAVIS_BUILD_DIR
3636

3737
before_install:
38-
- php dump_credentials.php
39-
- travis_retry testing/install_test_deps.sh
38+
- pushd ${HOME}
39+
- git clone https://github.com/GoogleCloudPlatform/php-tools.git
40+
- php php-tools/scripts/dump_credentials.php
41+
- travis_retry php-tools/scripts/install_test_deps.sh
42+
- popd
4043
- mkdir -p build/logs
4144

4245
script:

dump_credentials.php

Lines changed: 0 additions & 14 deletions
This file was deleted.

testing/install_test_deps.sh

Lines changed: 0 additions & 72 deletions
This file was deleted.

testing/run_test_suite.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set -ex
1717

1818
# run php-cs-fixer
1919
if [ "${RUN_CS_FIXER}" = "true" ]; then
20-
./php-cs-fixer fix --dry-run --diff --config-file=.php_cs .
20+
${HOME}/php-cs-fixer fix --dry-run --diff --config-file=.php_cs .
2121
fi
2222

2323
# loop through all directories containing "phpunit.xml" and run them

0 commit comments

Comments
 (0)