From 2e67f008e9988fd9021c8aaf5834286c8e1de026 Mon Sep 17 00:00:00 2001 From: Burak Yigit Kaya Date: Mon, 17 Jun 2019 22:03:47 +0300 Subject: [PATCH 1/2] ci(yarn): Fix TravisCI not using the checked-in yarn binary Follow up to #13569. Normally, any recent Yarn version (>1.0.0) should read the `yarn-path` value from the `.yarnrc` file but some TravisCI machines seem to be using an ancient version (`0.27.0`) that doesn't support this and causing build failures. This diff will ensure the correct binary is being used. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fdb036b9864..684a3e973348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,7 +93,7 @@ base_acceptance: &acceptance_default - docker run -d --network host --name snuba --env SNUBA_SETTINGS=test --env CLICKHOUSE_SERVER=localhost:9000 getsentry/snuba - docker ps -a install: - - yarn install --pure-lockfile + - ./bin yarn install --pure-lockfile - python setup.py install_egg_info - pip install -e ".[dev,tests,optional]" - wget -N "https://chromedriver.storage.googleapis.com/$(curl https://chromedriver.storage.googleapis.com/LATEST_RELEASE_74)/chromedriver_linux64.zip" -P ~/ @@ -118,7 +118,7 @@ matrix: - SENTRY_LIGHT_BUILD=1 pip install -e ".[dev,tests,optional]" - find "$NODE_DIR" -type d -empty -delete - nvm install - - yarn install --pure-lockfile + - ./bin/yarn install --pure-lockfile - <<: *postgres_default name: 'Backend [Postgres] (1/2)' @@ -156,7 +156,7 @@ matrix: - find "$NODE_DIR" -type d -empty -delete - nvm install install: - - yarn install --pure-lockfile + - ./bin/yarn install --pure-lockfile - python: 2.7 name: 'Command Line' @@ -221,7 +221,7 @@ matrix: # Use the decrypted service account credentials to authenticate the command line tool - gcloud auth activate-service-account --key-file client-secret.json install: - - yarn install --pure-lockfile + - ./bin/yarn install --pure-lockfile - gcloud version script: bash .travis/deploy-storybook.sh after_success: skip From 7c4b91fd9e5e79a1d5b961b2c27151398b1f41b6 Mon Sep 17 00:00:00 2001 From: Burak Yigit Kaya Date: Mon, 17 Jun 2019 22:13:38 +0300 Subject: [PATCH 2/2] typoman --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 684a3e973348..cd9fc6970804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,7 +93,7 @@ base_acceptance: &acceptance_default - docker run -d --network host --name snuba --env SNUBA_SETTINGS=test --env CLICKHOUSE_SERVER=localhost:9000 getsentry/snuba - docker ps -a install: - - ./bin yarn install --pure-lockfile + - ./bin/yarn install --pure-lockfile - python setup.py install_egg_info - pip install -e ".[dev,tests,optional]" - wget -N "https://chromedriver.storage.googleapis.com/$(curl https://chromedriver.storage.googleapis.com/LATEST_RELEASE_74)/chromedriver_linux64.zip" -P ~/