From 84c2bf550427a64e279438bdbe90ca3604738133 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Wed, 5 Jul 2017 11:40:36 -0700 Subject: [PATCH] Update README_TRAVIS.md Clarify when to delete caches --- README_TRAVIS.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/README_TRAVIS.md b/README_TRAVIS.md index 5de95439..a6e78fdb 100644 --- a/README_TRAVIS.md +++ b/README_TRAVIS.md @@ -3,14 +3,25 @@ Administrators: Are PRs taking > 1 hr to run through Travis? If you look at the Travis logs is it building `riscv-tools`? This is because someone committed a PR to `master` which bumped `riscv-tools` and the master cache needs to be updated. -This is the procedure to follow to get -things fast again. We don't generally build on merges to master, just PRs. +This is the procedure to follow to get things fast again. We don't generally branch updates (e.g. to `master`), just PRs. -1. Wait for your PR that you want to merge to go green. This will take a long time. +To get the master cache good again: + +1. Wait for the PR that is changing `riscv-tools` to go green. 2. On Travis, click `More Options -> Caches` on the upper right. -3. Click `Delete all Repository Caches`. +3. Click `Delete` for the `master` Cache. 4. Click `More Options->Settings` 5. On the `General Settings` section, switch the `Build Branch Updates` toggle to `ON`. -6. perform your PR's merge to master. This will cause the master cache to build `riscv-tools`. +6. Perform the PR's merge to `master`. This will cause the `master` cache to build `riscv-tools`. 7. Once the merge commit goes green on Travis, switch the `Build Branch Updates` toggle to `OFF`. +For other PRs which were happening in parallel to the bump of `riscv-tools`: + +If your PR already has a cache and you want to keep doing development with the old version of `riscv-tools`, no action is needed. + +If you want to merge or rebase your PR on top of `master` with the new version of `riscv-tools`, you should delete your PR branch's local cache. Otherwise it will rebuild the branch cache instead of using `master`'s cache. To do this: + +1. Wait for the previous steps to go through so that the `master` cache is done. +2. On Travis, click `More Options -> Caches` on the upper right. +3. Click `Delete` for your PR branch's cache. +4. Push updates to the PR as usual, it should download the new `master` cache.