From 72ea50dc6de73bd37fce3f99abe32ade311b6021 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Sun, 25 Oct 2020 10:00:59 +0800
Subject: [PATCH] Update GitHub Actions to use Composer v1 for the moment
 (#535)

Until such a time that `wikimedia/composer-merge-plugin` supports Composer 2.

Refs: https://github.com/octobercms/october/pull/5330#issuecomment-715988820
---
 .github/workflows/code-quality-push.yaml | 3 ++-
 .github/workflows/tests.yml              | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code-quality-push.yaml b/.github/workflows/code-quality-push.yaml
index f34f7b3b8..8c036b312 100644
--- a/.github/workflows/code-quality-push.yaml
+++ b/.github/workflows/code-quality-push.yaml
@@ -3,7 +3,8 @@ name: Code Quality
 on:
   push:
     branches:
-      - master
+      - 1.0
+      - 1.1
       - develop
 
 jobs:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a3634d1d3..9c0cfb5ed 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,7 +3,8 @@ name: Tests
 on:
   push:
     branches:
-      - master
+      - 1.0
+      - 1.1
       - develop
   pull_request:
 
@@ -43,7 +44,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.phpVersion }}
-          tools: composer
+          tools: composer:v1
           extensions: ${{ env.extensions }}
 
       - name: Setup dependency cache
@@ -65,4 +66,4 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Run tests
-        run: ./vendor/bin/phpunit ./tests
\ No newline at end of file
+        run: ./vendor/bin/phpunit ./tests