Merge remote-tracking branch 'origin/rc/3.3' into 'main'

ruby/scripts/identical-files.json

@@ -1,48 +0,0 @@
-{
-    "SSA": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll"
-    ],
-    "DataFlow Common": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll"
-    ],
-    "DataFlow": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll"
-    ],
-    "DataFlow Consistency": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll"
-    ],
-    "DataFlow Summaries": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll"
-    ],
-    "TaintTracking": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-        "ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
-    ],
-    "TypeTracker": [
-        "codeql/python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll",
-        "ql/lib/codeql/ruby/typetracking/TypeTracker.qll"
-    ],
-    "Inline Test Expectations": [
-        "codeql/python/ql/test/TestUtilities/InlineExpectationsTest.qll",
-        "ql/test/TestUtilities/InlineExpectationsTest.qll"
-    ],
-    "CFG": [
-        "codeql/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll",
-        "ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll"
-    ],
-    "ReDoS Polynomial Ruby/Python/JS": [
-        "codeql/javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll",
-        "codeql/python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll",
-        "ql/lib/codeql/ruby/regexp/SuperlinearBackTracking.qll"
-    ],
-    "CodeQL Tutorial": [
-        "codeql/cpp/ql/lib/tutorial.qll",
-        "ql/lib/tutorial.qll"
-    ]
-}

ruby/scripts/sync-identical-files.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-
-# Due to various technical limitations, we sometimes have files that need to be
-# kept identical in the repository. This script loads a database of such
-# files and can perform two functions: check whether they are still identical,
-# and overwrite the others with a master copy if needed.
-# The script that does the actual work is `sync-files.py`, which lives in the `codeql` submodule.
-import sys
-import os
-
-sys.path.append(os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../codeql/config')))
-
-import importlib
-syncfiles = importlib.import_module('sync-files')
-
-def chdir_repo_root():
-    root_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')
-    os.chdir(root_path)
-
-def sync_identical_files():
-    if len(sys.argv) == 1:
-        master_file_picker = lambda files: None
-    elif len(sys.argv) == 2:
-        if sys.argv[1] == "--latest":
-            master_file_picker = syncfiles.choose_latest_file
-        elif os.path.isfile(sys.argv[1]):
-            master_file_picker = lambda files: syncfiles.choose_master_file(sys.argv[1], files)
-        else:
-            raise Exception("File not found")
-    else:
-        raise Exception("Bad command line or file not found")
-    chdir_repo_root()
-    syncfiles.load_if_exists('.', 'scripts/identical-files.json')
-    for group_name, files in syncfiles.file_groups.items():
-        syncfiles.check_group(group_name, files, master_file_picker, syncfiles.emit_local_error)
-
-def main():
-    sync_identical_files()
-
-    if syncfiles.local_error_count > 0:
-        exit(1)
-    else:
-        print(__file__ +": All checks OK.")
-
-if __name__ == "__main__":
-    main()