From de19003bad3dd2428dc3b4847a7a4f3ba54c0421 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 28 Apr 2022 15:51:48 +0200
Subject: [PATCH] DEV: Minor workflow updates (#16583)

---
 .github/workflows/ember_with_plugins.yml |  2 +-
 .github/workflows/licenses.yml           | 19 +++++++++++--------
 .github/workflows/linting.yml            |  2 +-
 .github/workflows/tests.yml              |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ember_with_plugins.yml b/.github/workflows/ember_with_plugins.yml
index 52b4277415b..56ed498b220 100644
--- a/.github/workflows/ember_with_plugins.yml
+++ b/.github/workflows/ember_with_plugins.yml
@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml
index 72abb7b6c9d..19a263f7f72 100644
--- a/.github/workflows/licenses.yml
+++ b/.github/workflows/licenses.yml
@@ -4,18 +4,21 @@ on:
   pull_request:
   push:
     branches:
-      - master
       - main
 
+concurrency:
+  group: licenses-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: run
     runs-on: ubuntu-latest
-    container: discourse/discourse_test:release
-    timeout-minutes: 30
+    container: discourse/discourse_test:slim
+    timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
@@ -25,7 +28,7 @@ jobs:
           git config --global user.name "Discourse CI"
 
       - name: Bundler cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -49,7 +52,7 @@ jobs:
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
       - name: Yarn cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
@@ -69,5 +72,5 @@ jobs:
       - name: Check Yarn Licenses
         if: ${{ always() }}
         run: |
-          yarn add licensee
-          yarn exec licensee -- --errors-only
+          yarn global add licensee
+          licensee --errors-only
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index e1187dcffad..97f0236bbb5 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -18,7 +18,7 @@ jobs:
     timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fc76e8c78b8..6ab6fa2dfc1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -43,7 +43,7 @@ jobs:
             target: core-plugins
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1