1
0

Update README_TRAVIS.md

Clarify when to delete caches
This commit is contained in:
Megan Wachs 2017-07-05 11:40:36 -07:00 committed by GitHub
parent ec9fbe26d8
commit 84c2bf5504

View File

@ -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`? 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 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 This is the procedure to follow to get things fast again. We don't generally branch updates (e.g. to `master`), just PRs.
things fast again. We don't generally build on merges 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. 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` 4. Click `More Options->Settings`
5. On the `General Settings` section, switch the `Build Branch Updates` toggle to `ON`. 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`. 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.