From edd0cb0aae80e5f40b9622ea0d1f2cad29c1e517 Mon Sep 17 00:00:00 2001
From: Tim Sarbin <tim.sarbin@gmail.com>
Date: Tue, 29 Dec 2020 15:16:18 -0500
Subject: [PATCH 1/2] Fiddling with actions names

---
 .github/workflows/pullRequest.yml  |  3 ++-
 .github/workflows/pushToMaster.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index b7bda7e1..ffcec707 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.github/workflows/pullRequest.yml
@@ -1,8 +1,9 @@
 ---
 name: pull_request
+"on": [pull_request]
 jobs:
     build:
-        name: Build
+        name: 'Pull Request'
         runs-on: self-hosted
         continue-on-error: true
         steps:
diff --git a/.github/workflows/pushToMaster.yml b/.github/workflows/pushToMaster.yml
index 273ff550..8687e9e4 100644
--- a/.github/workflows/pushToMaster.yml
+++ b/.github/workflows/pushToMaster.yml
@@ -1,12 +1,12 @@
 ---
 name: build
-# "on":
-#     push:
-#         branches:
-#             - master
+"on":
+    push:
+        branches:
+            - master
 jobs:
     build:
-        name: Build
+        name: 'Push to Master'
         runs-on: self-hosted
         steps:
             -   name: Set up Go 1.14

From b18936eed0f1215f4dad5b1ff798fc2d4a366680 Mon Sep 17 00:00:00 2001
From: Tim Sarbin <tim.sarbin@gmail.com>
Date: Tue, 29 Dec 2020 15:20:24 -0500
Subject: [PATCH 2/2] Updated workflows

---
 .github/workflows/pullRequest.yml  | 11 +++++++--
 .github/workflows/pushToMaster.yml | 39 ------------------------------
 2 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/pushToMaster.yml

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index ffcec707..7089c18c 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.github/workflows/pullRequest.yml
@@ -1,9 +1,16 @@
 ---
 name: pull_request
-"on": [pull_request]
+on:
+	push:
+		branches:
+			- main
+	pull_request:
+		branches:
+			- main
+
 jobs:
     build:
-        name: 'Pull Request'
+        name: build
         runs-on: self-hosted
         continue-on-error: true
         steps:
diff --git a/.github/workflows/pushToMaster.yml b/.github/workflows/pushToMaster.yml
deleted file mode 100644
index 8687e9e4..00000000
--- a/.github/workflows/pushToMaster.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: build
-"on":
-    push:
-        branches:
-            - master
-jobs:
-    build:
-        name: 'Push to Master'
-        runs-on: self-hosted
-        steps:
-            -   name: Set up Go 1.14
-                uses: actions/setup-go@v2.1.3
-                with:
-                    go-version: 1.14
-                id: go
-
-            -   name: Check out code
-                uses: actions/checkout@v2.3.4
-
-            -   name: Install dependencies
-                run: |
-                    sudo apt-get update
-                    sudo apt-get install -y xvfb libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev libsdl2-dev libasound2-dev > /dev/null 2>&1
-
-            -   name: Run golangci-lint
-                continue-on-error: false
-                uses: golangci/golangci-lint-action@v2.3.0
-                with:
-                    version: v1.32
-
-            -   name: Run tests
-                env:
-                    DISPLAY: ":99.0"
-                run: |
-                    xvfb-run --auto-servernum go test -v -race ./...
-
-            -   name: Build binary
-                run: go build .