summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2019-12-31 22:03:07 -0800
committerTakashi Kokubun <takashikkbn@gmail.com>2019-12-31 22:03:21 -0800
commit8c9450e7b875db846b19cc631af0d7fee66db5c6 (patch)
treeb37e1845e504eb13de480d981f0dbda35908d006
parenteca964c24e94ceb9146bcf4c010d9abfc632637a (diff)
Remove code to prevent double build on trunk
trunk branch was deleted.
-rw-r--r--.github/workflows/cygwin.yml2
-rw-r--r--.github/workflows/macos.yml2
-rw-r--r--.github/workflows/mingw.yml2
-rw-r--r--.github/workflows/mjit.yml2
-rw-r--r--.github/workflows/ubuntu.yml2
-rw-r--r--.github/workflows/windows.yml2
-rw-r--r--appveyor.yml3
7 files changed, 6 insertions, 9 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 413f14d186..c7ea92bb40 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -2,7 +2,7 @@ name: Cygwin
on:
push:
branches:
- - master
+ - '*'
pull_request:
branches:
- '*'
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 87d7a802d7..39d0391b7f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -2,7 +2,7 @@ name: macOS
on:
push:
branches:
- - master
+ - '*'
pull_request:
branches:
- '*'
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 8283791574..9615c0007d 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -2,7 +2,7 @@ name: MinGW
on:
push:
branches:
- - master
+ - '*'
pull_request:
branches:
- '*'
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index 7d6cc10b69..105639ef39 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -2,7 +2,7 @@ name: MJIT
on:
push:
branches:
- - master
+ - '*'
pull_request:
branches:
- '*'
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 901bf02be6..7669038f70 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -2,7 +2,7 @@ name: Ubuntu
on:
push:
branches:
- - master
+ - '*'
pull_request:
branches:
- '*'
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ebbac19d99..cf4a4f6e12 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -2,7 +2,7 @@ name: Windows
on:
push:
branches:
- - master
+ - '*'
pull_request:
branches:
- '*'
diff --git a/appveyor.yml b/appveyor.yml
index b441712028..17efe005a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,9 +3,6 @@ version: '{build}'
shallow_clone: true
platform:
- x64
-branches:
- except:
- - trunk # mirrored from trunk. avoid doubly building on it
environment:
ruby_version: "24-%Platform%"
zlib_version: "1.2.11"