From 954134bb73abd822bc3ac5cf0e2ce5175c98af51 Mon Sep 17 00:00:00 2001
From: Discourse CI <ci@discourse>
Date: Fri, 9 Oct 2020 15:09:43 +0000
Subject: [PATCH] DEV: Update CI workflows

---
 .github/workflows/plugin-linting.yml | 55 +++++++++++++++-------------
 .github/workflows/plugin-tests.yml   |  9 ++++-
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml
index 5a20ec2..b7bfa24 100644
--- a/.github/workflows/plugin-linting.yml
+++ b/.github/workflows/plugin-linting.yml
@@ -1,41 +1,46 @@
 name: Linting
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Set up Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
 
-    - name: Set up ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7
+      - name: Set up ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7
 
-    - name: Setup bundler
-      run: gem install bundler -v 2.1.4 --no-doc
+      - name: Setup bundler
+        run: gem install bundler -v 2.1.4 --no-doc
 
-    - name: Setup gems
-      run: bundle install --jobs 4
+      - name: Setup gems
+        run: bundle install --jobs 4
 
-    - name: Yarn install
-      run: yarn install --dev
+      - name: Yarn install
+        run: yarn install --dev
 
-    - name: ESLint
-      run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern assets/javascripts
+      - name: ESLint
+        run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern assets/javascripts
 
-    - name: Prettier
-      run: |
-        yarn prettier -v
-        yarn prettier --list-different \
-          "assets/**/*.{scss,js,es6}"
+      - name: Prettier
+        run: |
+          yarn prettier -v
+          yarn prettier --list-different \
+            "assets/**/*.{scss,js,es6}"
 
-    - name: Rubocop
-      run: bundle exec rubocop .
+      - name: Rubocop
+        run: bundle exec rubocop .
diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
index fb2afda..d6cb3e5 100644
--- a/.github/workflows/plugin-tests.yml
+++ b/.github/workflows/plugin-tests.yml
@@ -1,6 +1,11 @@
 name: Plugin Tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
 
 jobs:
   build:
@@ -23,7 +28,7 @@ jobs:
 
       matrix:
         build_types: ["BACKEND", "FRONTEND"]
-        target: ["PLUGINS", "CORE"]
+        target: ["PLUGINS"]
         os: [ubuntu-latest]
         ruby: ["2.6"]
         postgres: ["12"]