From 3d28c0182d5c3d32cb70f2d92531b53e661cd94c Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Wed, 28 Jun 2017 23:10:00 -0700 Subject: [PATCH 1/2] travis: add a branch whitelist with just 'master'. Travis allows us to build on branch updates and on PRs. Right now our process is to build always on PRs, but to manually only build 'master' when we know that riscv-tools has been bumped (because that rebuilds the master cache which holds riscv-tools). But this is an annoying and error-prone processes that requires extra admin permissions. With this change, i think we can just leave "Build Branch Updates" to "ON" and get the same effect we are currently doing manually, because only on update to master branch will it do a build. PRs to master branch will get a build. PRs to other branches will I believe NOT get a build. --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index a139b76b..5f0707f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,18 @@ branches: - hwacha - boom - /^hurricane.*$/ + +# These branches are the only ones that +# will build when "build branch updates" +# is set in settings (branches which PR against +# them are still built). With this set, +# the above blacklist is not useful. +# Adding this allows us to keep "Build Branch Updates" +# set to 'ON'. + +branches: + only: + - master jobs: include: From ddd2b2236d0e647450457260258050d659fb1815 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Mon, 3 Jul 2017 13:23:27 -0700 Subject: [PATCH 2/2] bump riscv-tools/riscv-fesvr to pick up multicore fixes --- riscv-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscv-tools b/riscv-tools index 75371b4e..6b608940 160000 --- a/riscv-tools +++ b/riscv-tools @@ -1 +1 @@ -Subproject commit 75371b4e19435833f80767da691b718c68551f13 +Subproject commit 6b6089401e06ff74c2e0735ad52472ee0a214f3f