From b04f170d758466e0d75c0ffd8b5ccd5471c1f053 Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Sat, 14 Nov 2020 12:13:36 -0600
Subject: [PATCH 1/2] ci: remove no-longer needed mingw setup

---
 .github/workflows/windows.yml | 37 -----------------------------------
 1 file changed, 37 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7e91940f2cf..650a2184577 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -23,7 +23,6 @@ jobs:
         include:
           - channel: nightly
             target: i686-pc-windows-gnu
-            mingw-7z-path: mingw
 
     env:
       CFG_RELEASE_CHANNEL: nightly
@@ -37,42 +36,6 @@ jobs:
     - name: checkout
       uses: actions/checkout@v2
 
-    # The Windows runners do not (yet) have a proper msys/mingw environment
-    # pre-configured like AppVeyor does, though they will likely be added in the future.
-    # https://github.com/actions/virtual-environments/issues/30
-    #
-    # In the interim, this ensures mingw32 is installed and available on the PATH
-    # for the i686-pc-windows-gnu target. This approach is used because it's common in
-    # other rust projects and there are issues/limitations with the msys2 chocolatey nuget
-    # package and numworks/setup-msys2 action.
-    # https://github.com/rust-lang/rust/blob/master/src/ci/scripts/install-mingw.sh#L59
-    # https://github.com/rust-lang/rustup/blob/master/appveyor.yml
-    #
-    # Use GitHub Actions cache support to avoid downloading the .7z file every time
-    # to be cognizant of the AWS egress cost impacts
-    # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-    - name: cache mingw.7z
-      id: cache-mingw
-      with:
-        path: ${{ matrix.mingw-7z-path }}
-        key: ${{ matrix.channel }}-${{ matrix.target }}-mingw
-      uses: actions/cache@v1
-      if: matrix.target == 'i686-pc-windows-gnu' && matrix.channel == 'nightly'
-    - name: download mingw.7z
-      run: |
-        # Disable the download progress bar which can cause perf issues
-        $ProgressPreference = "SilentlyContinue"
-        md -Force ${{ matrix.mingw-7z-path }}
-        Invoke-WebRequest https://ci-mirrors.rust-lang.org/rustc/i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z -OutFile ${{ matrix.mingw-7z-path }}/mingw.7z
-      if: matrix.target == 'i686-pc-windows-gnu' && matrix.channel == 'nightly' && steps.cache-mingw.outputs.cache-hit != 'true'
-      shell: powershell
-    - name: install mingw32
-      run: |
-        7z x -y ${{ matrix.mingw-7z-path }}/mingw.7z -oC:\msys64 | Out-Null
-        echo "C:\msys64\mingw32\bin" >> $GITHUB_PATH
-      if: matrix.target == 'i686-pc-windows-gnu' && matrix.channel == 'nightly'
-      shell: powershell
-
       # Run build
     - name: setup
       uses: actions-rs/toolchain@v1

From d0e1561ea60130f778e30e61414156479dfc9689 Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Sat, 14 Nov 2020 18:07:04 -0600
Subject: [PATCH 2/2] ci: restrict GHA workflow triggers on push

---
 .github/workflows/integration.yml | 6 +++++-
 .github/workflows/linux.yml       | 6 +++++-
 .github/workflows/mac.yml         | 6 +++++-
 .github/workflows/windows.yml     | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 6dafb483cd6..2e832b6b62d 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -1,5 +1,9 @@
 name: integration
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   integration-tests:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 559eaec1595..0a4ae2735b3 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,5 +1,9 @@
 name: linux
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test:
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 39a6c1cc4d2..a11b02fde4d 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -1,5 +1,9 @@
 name: mac
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 650a2184577..0c1dd58578c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,5 +1,9 @@
 name: windows
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test: