From 1ca08664e8cb8964115f715a21d7a0b2e5a2adff Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Tue, 27 Oct 2020 00:42:35 -0700
Subject: [PATCH] By default, build osx on push

---
 .github/workflows/osx-ci.yml   | 2 +-
 .github/workflows/win32-ci.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/osx-ci.yml b/.github/workflows/osx-ci.yml
index 2ed1fbf539..ab6c64810d 100644
--- a/.github/workflows/osx-ci.yml
+++ b/.github/workflows/osx-ci.yml
@@ -7,7 +7,7 @@ env:
   TRAVIS_OS_NAME: osx
   BUILD_TARGET: osx
   # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: false
+  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
   GITHUB_CI: true
 
diff --git a/.github/workflows/win32-ci.yml b/.github/workflows/win32-ci.yml
index cab3a72e08..5c28bc21e1 100644
--- a/.github/workflows/win32-ci.yml
+++ b/.github/workflows/win32-ci.yml
@@ -5,10 +5,11 @@ on: [push]
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
+  TRAVIS_PULL_REQUEST: false
 
 jobs:
   build:
-    if: "!contains(github.event.commits[0].message, '[skip ci]')"
+    if: "!contains(github.event.commits[0].message, '[skip ci]') && contains(github.event.commits[0].message, 'Merge pull request')"
     # The CMake configure and build commands are platform agnostic and should work equally
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.