Skip to content

Use files from php-tools repo. #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmatsuo merged 1 commit into from
May 16, 2016
Merged

Use files from php-tools repo. #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,16 @@ env:
global:
- GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/credentials.json
- GOOGLE_VERSION_ID=$TRAVIS_JOB_ID
- PATH=${HOME}/gcloud/google-cloud-sdk/bin:${PATH}
- PATH=${HOME}/google-cloud-sdk/bin:${PATH}
- PHP_CGI_PATH=/home/travis/.phpenv/shims/php-cgi
- TEST_BUILD_DIR=$TRAVIS_BUILD_DIR

before_install:
- php dump_credentials.php
- travis_retry testing/install_test_deps.sh
- pushd ${HOME}
- git clone https://github.com/GoogleCloudPlatform/php-tools.git
Copy link
Contributor

@bshaffer bshaffer May 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we cloning this instead of just adding it to require-dev in composer.json?

Copy link
Contributor Author

@tmatsuo tmatsuo May 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can do that, but currently we don't have top level composer.json and I just thought it's not warrant to add the top level composer.json. Each test has it in their require-dev.

Copy link
Contributor

@bshaffer bshaffer May 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, I see. Yeah let's not worry about it then.

- php php-tools/scripts/dump_credentials.php
- travis_retry php-tools/scripts/install_test_deps.sh
- popd
- mkdir -p build/logs

script:
Expand Down
14 changes: 0 additions & 14 deletions dump_credentials.php
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions testing/install_test_deps.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion testing/run_test_suite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -ex

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

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