From c0bd802f787b50ea1acf9ff50e9fc4a88a96851b Mon Sep 17 00:00:00 2001
From: discoursebot <team@discourse.org>
Date: Fri, 2 Jul 2021 11:02:39 -0400
Subject: [PATCH] DEV: Update CI workflows (#81)

Co-authored-by: davidtaylorhq <davidtaylorhq@users.noreply.github.com>
---
 .github/workflows/plugin-linting.yml | 14 +++++++----
 .github/workflows/plugin-tests.yml   | 36 ++++++++++++++++------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml
index f43eae8..51b9b82 100644
--- a/.github/workflows/plugin-linting.yml
+++ b/.github/workflows/plugin-linting.yml
@@ -29,20 +29,26 @@ jobs:
         run: yarn install
 
       - name: ESLint
+        if: ${{ always() }}
         run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,assets}/javascripts
 
       - name: Prettier
+        if: ${{ always() }}
+        shell: bash
         run: |
           yarn prettier -v
-          if [ -d "assets" ]; then \
-            yarn prettier --list-different "assets/**/*.{scss,js,es6}" ; \
+          shopt -s extglob
+          if ls assets/**/*.@(scss|js|es6) &> /dev/null; then
+            yarn prettier --list-different "assets/**/*.{scss,js,es6}"
           fi
-          if [ -d "test" ]; then \
-            yarn prettier --list-different "test/**/*.{js,es6}" ; \
+          if ls test/**/*.@(js|es6) &> /dev/null; then
+            yarn prettier --list-different "test/**/*.{js,es6}"
           fi
 
       - name: Ember template lint
+        if: ${{ always() }}
         run: yarn ember-template-lint assets/javascripts
 
       - name: Rubocop
+        if: ${{ always() }}
         run: bundle exec rubocop .
diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
index cf0a527..b28d0e2 100644
--- a/.github/workflows/plugin-tests.yml
+++ b/.github/workflows/plugin-tests.yml
@@ -28,7 +28,7 @@ jobs:
       matrix:
         build_type: ["backend", "frontend"]
         ruby: ["2.7"]
-        postgres: ["12"]
+        postgres: ["13"]
         redis: ["4.x"]
 
     services:
@@ -58,18 +58,6 @@ jobs:
           path: plugins/${{ github.event.repository.name }}
           fetch-depth: 1
 
-      - name: Check spec existence
-        id: check_spec
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "plugins/${{ github.event.repository.name }}/spec"
-
-      - name: Check qunit existence
-        id: check_qunit
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "plugins/${{ github.event.repository.name }}/test/javascripts"
-
       - name: Setup Git
         run: |
           git config --global user.email "ci@ci.invalid"
@@ -121,11 +109,29 @@ jobs:
           bin/rake db:create
           bin/rake db:migrate
 
+      - name: Check spec existence
+        id: check_spec
+        shell: bash
+        run: |
+          shopt -s extglob
+          if ls plugins/${{ github.event.repository.name }}/spec/**/*.@(rb) &> /dev/null; then
+            echo "::set-output name=files_exist::true"
+          fi
+
       - name: Plugin RSpec
-        if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exists == 'true'
+        if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exist == 'true'
         run: bin/rake plugin:spec[${{ github.event.repository.name }}]
 
+      - name: Check qunit existence
+        id: check_qunit
+        shell: bash
+        run: |
+          shopt -s extglob
+          if ls plugins/${{ github.event.repository.name }}/test/javascripts/**/*.@(js|es6) &> /dev/null; then
+            echo "::set-output name=files_exist::true"
+          fi
+
       - name: Plugin QUnit
-        if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exists == 'true'
+        if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exist == 'true'
         run: bundle exec rake plugin:qunit['${{ github.event.repository.name }}','1200000']
         timeout-minutes: 30