From 8d3d51314ec41624355ea52e86625850a7630857 Mon Sep 17 00:00:00 2001
From: Ewout ter Hoeven <E.M.terHoeven@student.tudelft.nl>
Date: Fri, 5 Feb 2021 00:00:02 +0100
Subject: [PATCH] CI: Maintenance, update checkout, setup-node and cache to v2
 (#4813)

- Run on PRs
- Use v2 of checkout, setup-node and cache (for faster performance)
---
 .github/workflows/ci.yml   | 23 +++++++++--------------
 .github/workflows/snyk.yml |  5 ++---
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa0f4224fa..c64c221104 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,8 +2,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 name: CI
-
-on: [push]
+on: [push, pull_request]
 
 jobs:
   lint:
@@ -12,12 +11,11 @@ jobs:
     steps:
     - run: lsb_release -a
     - run: uname -a
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
         node-version: '12.18.3'
     - run: npm install -g yarn@1.22.0
-
     - run: yarn install --frozen-lockfile
     - run: yarn generate
     - run: yarn lint
@@ -32,12 +30,11 @@ jobs:
 
     steps:
     - run: uname -a
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
         node-version: '12.18.3'
     - run: npm install -g yarn@1.22.0
-
     - run: yarn install --frozen-lockfile
     - run: yarn generate
     - run: yarn prepare-beta-build
@@ -55,13 +52,12 @@ jobs:
     steps:
     - run: lsb_release -a
     - run: uname -a
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
         node-version: '12.18.3'
     - run: sudo apt-get install xvfb
     - run: npm install -g yarn@1.22.0
-
     - run: yarn install --frozen-lockfile
     - run: yarn generate
     - run: yarn prepare-beta-build
@@ -83,12 +79,11 @@ jobs:
     - run: systeminfo
     - run: git config --global core.autocrlf false
     - run: git config --global core.eol lf
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
         node-version: '12.18.3'
     - run: npm install -g yarn@1.22.0
-
     - run: yarn install --frozen-lockfile
     - run: yarn generate
     - run: node build\grunt.js
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
index 0920e21200..86b43e80a5 100644
--- a/.github/workflows/snyk.yml
+++ b/.github/workflows/snyk.yml
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 name: Snyk
-
 on:
   schedule:
     - cron:  '0 12 * * *'
@@ -15,8 +14,8 @@ jobs:
     steps:
     - run: lsb_release -a
     - run: uname -a
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
         node-version: '12.18.3'
     - run: npm install -g yarn@1.22.0