widelands

Merge lp:~widelands-dev/widelands/ignore_dev_branch into lp:widelands

  1. ignore_dev_branch
  2. Merge into trunk
Proposed by Tino
Status: Merged
Merged at revision: 7771
Proposed branch: lp:~widelands-dev/widelands/ignore_dev_branch
Merge into: lp:widelands
Diff against target: 15 lines (+5/-0)
1 file modified
.travis.yml (+5/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/ignore_dev_branch
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+284711@code.launchpad.net

Commit message

For Travis builds ignore github branch _widelands_dev_widelands_trunk.

Description of the change

Currently bunnybot mirrors trunk to both github branches master and _widelands_dev_widelands_trunk.
Let Travis only build master.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

@bunnybot merge

review: Approve
Revision history for this message
SirVer (sirver) wrote :

Awesome!! I did not know about that option, that is way less wasted cycles :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.yml'
2--- .travis.yml 2016-01-16 17:52:56 +0000
3+++ .travis.yml 2016-02-02 10:42:23 +0000
4@@ -8,6 +8,11 @@
5 - "sh -e /etc/init.d/xvfb start"
6 - sleep 3 # give xvfb some time to start
7
8+# ignore this branch because it is only a mirror of master
9+branches:
10+ except:
11+ - _widelands_dev_widelands_trunk
12+
13 matrix:
14 include:
15 - compiler: clang

Subscribers

People subscribed via source and target branches

to status/vote changes: