ruby-changes:55871
From: Takashi <ko1@a...>
Date: Tue, 28 May 2019 10:03:58 +0900 (JST)
Subject: [ruby-changes:55871] Takashi Kokubun: cf904d9f9f (trunk): Avoid doubly building Travis and AppVeyor
https://git.ruby-lang.org/ruby.git/commit/?id=cf904d9f9f From cf904d9f9fb18fd2982651946125db62066c3ff5 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Tue, 28 May 2019 10:02:30 +0900 Subject: Avoid doubly building Travis and AppVeyor but on "master" branch. For Pull Request, I changed the approach from d9b338a53f520b2dbb05555f18b8de8072300f40 and 277e68825a8e4d0e6503a32e41f8b1b6c078b567. diff --git a/.travis.yml b/.travis.yml index 2d6ea86..6e1d15e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -438,8 +438,9 @@ script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L438 # Branch matrix. Not all branches are Travis-ready so we limit branches here. branches: only: - - master - - trunk # for pull request. TODO: use `fork = true` or something. + # Because default branch is still "trunk", we build only "trunk" to avoid + # doubly building on master and trigger CI on Pull Request. + - trunk # TODO: s/master/trunk/ when the default branch is switched to master on 7/1. - ruby_2_4 - ruby_2_5 - ruby_2_6 diff --git a/appveyor.yml b/appveyor.yml index 9ecb083..029a0b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,10 +3,11 @@ version: '{build}' https://github.com/ruby/ruby/blob/trunk/appveyor.yml#L3 shallow_clone: true platform: - x64 -## Still allowing trunk branch for pull request. TODO: Skip non-pull-request trunk build. -# branches: -# except: -# - trunk # mirrored master runs CI +branches: + except: + # Because default branch is still "trunk", we build only "trunk" to avoid + # doubly building on master and trigger CI on Pull Request. + - master # mirrored from trunk environment: ruby_version: "24-%Platform%" zlib_version: "1.2.11" -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/