From 6045f98e552f1d4a09e4074d7d15dc0feb713834 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 11 Feb 2022 12:30:22 -0800
Subject: [PATCH 1/4] Run tests on main branch

Update run-tests to work with the newly re-named main branch,
---
 .github/workflows/run-tests.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index e6737cfa6..c848d9094 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -2,12 +2,12 @@ name: Run tests
 on:
   push:
     branches:
-      - master
+      - main
     paths-ignore:
       - 'apple/**'
   pull_request:
     branches:
-      - master
+      - main
     paths-ignore:
       - 'apple/**'
 

From 45e8671e3c2e2e0a62b19c05213296436b60fbe8 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 11 Feb 2022 12:52:52 -0800
Subject: [PATCH 2/4] Run tests on non-self-hosted runners

---
 .github/workflows/run-tests.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index c848d9094..9b4e6af12 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -15,7 +15,6 @@ jobs:
   run-graphql-inspector:
     name: Run GraphQL Inspector Checks
     if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
-    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v2
         with:
@@ -27,7 +26,6 @@ jobs:
 
   run-code-tests:
     name: Run Codebase tests
-    runs-on: self-hosted
     services:
       postgres:
         image: postgres

From 975b93a31b1ebb70f02798f40314440ab5b5d7b4 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 11 Feb 2022 12:56:00 -0800
Subject: [PATCH 3/4] Run tests on ubuntu-latest

---
 .github/workflows/run-tests.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 9b4e6af12..5839c8066 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -15,6 +15,7 @@ jobs:
   run-graphql-inspector:
     name: Run GraphQL Inspector Checks
     if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -26,6 +27,7 @@ jobs:
 
   run-code-tests:
     name: Run Codebase tests
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres

From 91787fc5dd3a4665f7ca058c26ebb9f49b1d981c Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 11 Feb 2022 12:59:39 -0800
Subject: [PATCH 4/4] Use setup-node action to setup nodejs runtime

---
 .github/workflows/run-tests.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 5839c8066..4ce0328d4 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -50,8 +50,10 @@ jobs:
           psql --host localhost --port ${{ job.services.postgres.ports[5432] }} --user postgres --password -c "CREATE DATABASE omnivore_test;"
         env:
           PGPASSWORD: postgres
-      - name: Setup nodejs 14.18
-        run: source ~/.nvm/nvm.sh && nvm install 14.18 && nvm use 14.18 && npm install -g yarn
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14.18
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(source ~/.nvm/nvm.sh && yarn cache dir)"