From 3a15d456b4e68f492d6a41e3813170601342d066 Mon Sep 17 00:00:00 2001
From: SteelWagstaff <steel@pressbooks.com>
Date: Tue, 19 Apr 2022 21:21:24 -0700
Subject: [PATCH] Improve CI flow

---
 .github/workflows/build-and-lint.yml      | 8 +++++++-
 .github/workflows/standards-and-tests.yml | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml
index 09d4d93..c865209 100644
--- a/.github/workflows/build-and-lint.yml
+++ b/.github/workflows/build-and-lint.yml
@@ -1,5 +1,11 @@
-on: push
 name: Build & Lint
+on:
+  push:
+    branches: [ dev, master ]
+    tags:
+      - '*.*.*'
+  pull_request:
+    branches: [ dev ]
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/standards-and-tests.yml b/.github/workflows/standards-and-tests.yml
index 17da9ec..34f5e07 100644
--- a/.github/workflows/standards-and-tests.yml
+++ b/.github/workflows/standards-and-tests.yml
@@ -1,7 +1,7 @@
 name: Run Standards & Tests
 on:
   push:
-    branches: [ dev, main ]
+    branches: [ dev, master ]
     tags:
       - '*.*.*'
   pull_request:
@@ -41,11 +41,11 @@ jobs:
           path: vendor
           key: php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
 
-      - name: Setup PHP
+      - name: Setup PHP with Composer 2
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: phpcs, composer:v1
+          tools: phpcs, composer
           coverage: pcov
 
       - name: Install PHP dependencies