From 53a7bb0a7e331141172290f9e928e026acc8ef5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20M=C3=BCller?= <jacob.mueller.elz@gmail.com>
Date: Tue, 4 May 2021 14:23:17 +0200
Subject: [PATCH] chore(ci): update workflows to new Node.js versions

---
 .github/workflows/build.yml  |  4 ++--
 .github/workflows/codeql.yml | 41 +++++++++---------------------------
 .github/workflows/test.yml   |  7 +++---
 3 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12a03c53d1c..e036789ac51 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [10, 12, 14]
+        node: [12, 14, 16]
 
     steps:
       - name: Clone repository
@@ -50,6 +50,6 @@ jobs:
 
       - name: BundleWatch
         run: yarn run bundlewatch
-        if: matrix.node == '14'
+        if: matrix.node == '16'
         env:
           BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5e14f515e7f..ffd81997f3f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,7 +2,16 @@ name: "CodeQL"
 
 on:
   push:
+    branches:
+      - dev
+      - master
+      - "!dependabot/**"
   pull_request:
+    # The branches below must be a subset of the branches above
+    branches:
+      - dev
+      - master
+      - "!dependabot/**"
   schedule:
     - cron: "0 2 * * 5"
 
@@ -11,48 +20,18 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["javascript"]
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-        with:
-          # We must fetch at least the immediate parents so that if this is
-          # a pull request then we can checkout the head
-          fetch-depth: 2
-
-      # If this run was triggered by a pull request event, then checkout
-      # the head of the pull request instead of the merge commit
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file
-          # By default, queries listed here will override any specified in a config file
-          # Prefix the list here with "+" to use these queries and those in the config file
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+          languages: "javascript"
 
-      # Autobuild attempts to build any compiled languages (C/C++, C#, or Java)
-      # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
         uses: github/codeql-action/autobuild@v1
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines and
-      #    modify them (or add more) to build your code if your project uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 522ce1ec507..5e0b025fc28 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [16]
 
     steps:
       - name: Clone repository
@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [14]
+        node: [16]
 
     steps:
       - name: Clone repository
@@ -91,7 +91,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [10, 12, 14]
+        node: [12, 14, 16]
 
     steps:
       - name: Clone repository
@@ -124,7 +124,6 @@ jobs:
 
       - name: CodeCov
         uses: codecov/codecov-action@v1
-        if: matrix.node == '14'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: unittests