From f68151a37e74e74907068592378d1d5e5cd17001 Mon Sep 17 00:00:00 2001
From: Ian Lewis <ianlewis@google.com>
Date: Fri, 10 Mar 2023 02:59:14 +0000
Subject: [PATCH] Always run CodeQL

Signed-off-by: Ian Lewis <ianlewis@google.com>
---
 .github/workflows/codeql-analysis-noop.yml | 36 ----------------------
 .github/workflows/codeql-analysis.yml      |  8 -----
 2 files changed, 44 deletions(-)
 delete mode 100644 .github/workflows/codeql-analysis-noop.yml

diff --git a/.github/workflows/codeql-analysis-noop.yml b/.github/workflows/codeql-analysis-noop.yml
deleted file mode 100644
index 3f91e99886..0000000000
--- a/.github/workflows/codeql-analysis-noop.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# This workflow implements the CodeQL / Analyze job as a no-op for docs and
-# coniguration updates (.md and .yml files) in order to satisfy the required
-# CodeQL / Analyze status check.
-# See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks
-# for a reference on why this works.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [main, "*"]
-    paths:
-      - "**/*.yml"
-      - "**/*.md"
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [main]
-    paths:
-      - "**/*.yml"
-      - "**/*.md"
-
-permissions: read-all
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No codeql required" '
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7a457d5e66..f22f3df8cb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,17 +14,9 @@ name: "CodeQL"
 on:
   push:
     branches: [main, "*"]
-    paths-ignore:
-      # If more paths are added here, then they must be added to the paths
-      # of codeql-analysis-noop.yml.
-      - "**/*.yml"
-      - "**/*.md"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [main]
-    paths-ignore:
-      - "**/*.yml"
-      - "**/*.md"
   merge_group:
   schedule:
     - cron: "21 0 * * 2"