From 319e6cea3e09e2766f790deccccefd024e57b9d6 Mon Sep 17 00:00:00 2001
From: Daniel <50356015+danny007in@users.noreply.github.com>
Date: Sun, 19 Mar 2023 14:02:44 +0530
Subject: [PATCH] update workflow

---
 .github/codeql/codeql-config.yml  |  3 +-
 .github/workflows/bundlewatch.yml | 43 +++++++++++++++++++++
 .github/workflows/ci.yml          | 64 -------------------------------
 .github/workflows/codeql.yml      | 21 +++++++---
 .github/workflows/lint.yml        | 29 ++++++--------
 5 files changed, 71 insertions(+), 89 deletions(-)
 create mode 100644 .github/workflows/bundlewatch.yml
 delete mode 100644 .github/workflows/ci.yml

diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index e5b1ea6e7..42e51f94d 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -1,5 +1,4 @@
 name: "CodeQL config"
 
 paths-ignore:
-  - docs/assets/plugins/
-  - plugins/
+  - dist
diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/bundlewatch.yml
new file mode 100644
index 000000000..eb734d86e
--- /dev/null
+++ b/.github/workflows/bundlewatch.yml
@@ -0,0 +1,43 @@
+name: Bundlewatch
+
+on:
+  push:
+    branches-ignore:
+      - "dependabot/**"
+  pull_request:
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 2
+  NODE: 18
+
+permissions:
+  contents: read
+
+jobs:
+  bundlewatch:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "${{ env.NODE }}"
+          cache: npm
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run dist
+        run: npm run compile
+
+      - name: Run bundlewatch
+        run: npm run bundlewatch
+        env:
+          BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
+          CI_BRANCH_BASE: v4-dev
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 9dd17b29f..000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-      - v4-dev
-  pull_request:
-    branches:
-      - "**"
-
-env:
-  FORCE_COLOR: 2
-
-jobs:
-  run:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - "14.x"
-          - "16.x"
-          - "18.x"
-        os:
-          - "ubuntu-latest"
-          - "macos-latest"
-          - "windows-latest"
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: Get npm cache directory
-        id: npm-cache
-        run: |
-          echo "::set-output name=dir::$(npm config get cache)"
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.npm-cache.outputs.dir }}
-          key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
-          restore-keys: |
-            ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-            ${{ runner.os }}-node-v${{ matrix.node }}-
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Build files
-        run: npm run compile
-
-      - name: Run bundlewatch
-        run: npm run bundlewatch
-        if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.node, '16')
-        env:
-          BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
\ No newline at end of file
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2faf44c1e..5431d23bd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -3,33 +3,42 @@ name: "CodeQL"
 on:
   push:
     branches:
-      - master
+      - v4-dev
       - "!dependabot/**"
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
-      - master
+      - v4-dev
+      - "!dependabot/**"
   schedule:
     - cron: "0 0 * * 0"
+  workflow_dispatch:
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: "javascript"
           config-file: ./.github/codeql/codeql-config.yml
+          queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:javascript"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a518fc460..12af83ea3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,16 +2,17 @@ name: Lint
 
 on:
   push:
-    branches:
-      - master
-      - v4-dev
+    branches-ignore:
+      - "dependabot/**"
   pull_request:
-    branches:
-      - "**"
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
-  NODE: 18.x
+  NODE: 18
+
+permissions:
+  contents: read
 
 jobs:
   run:
@@ -19,21 +20,15 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "${{ env.NODE }}"
-
-      - name: Set up npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
-          restore-keys: |
-            ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
-            ${{ runner.os }}-node-v${{ env.NODE }}-
+          cache: npm
 
       - name: Install npm dependencies
         run: npm ci