From eed43245dfdd6d616f7a7d72ba4ca52de3d59584 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Fri, 26 Jul 2024 11:50:33 -0400 Subject: CodeQlQueries.qls: Pin to the 1.1.0 codeq/cpp-queries pack The codeql/cpp-queries pack used in CodeQlQueries.qls was versioned 1.1.0 for the CodeQL CLI v2.18.1 release currently used. https://github.com/github/codeql/blob/codeql-cli/v2.18.1/cpp/ql/src/qlpack.yml This change pins that pack version to prevent the CodeQL CLI and pack from getting out of sync until explicitly updated. Signed-off-by: Michael Kubacki --- BaseTools/Plugin/CodeQL/CodeQlQueries.qls | 2 +- BaseTools/Plugin/CodeQL/codeqlcli_ext_dep.yaml | 7 +++++++ BaseTools/Plugin/CodeQL/codeqlcli_linux_ext_dep.yaml | 7 +++++++ BaseTools/Plugin/CodeQL/codeqlcli_windows_ext_dep.yaml | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/BaseTools/Plugin/CodeQL/CodeQlQueries.qls b/BaseTools/Plugin/CodeQL/CodeQlQueries.qls index 34fa6b3665..0da9baf95d 100644 --- a/BaseTools/Plugin/CodeQL/CodeQlQueries.qls +++ b/BaseTools/Plugin/CodeQL/CodeQlQueries.qls @@ -2,7 +2,7 @@ - description: C++ queries - queries: '.' - from: codeql/cpp-queries + from: codeql/cpp-queries@1.1.0 ########################################################################################## # Queries diff --git a/BaseTools/Plugin/CodeQL/codeqlcli_ext_dep.yaml b/BaseTools/Plugin/CodeQL/codeqlcli_ext_dep.yaml index 842c144f0b..3be80cb647 100644 --- a/BaseTools/Plugin/CodeQL/codeqlcli_ext_dep.yaml +++ b/BaseTools/Plugin/CodeQL/codeqlcli_ext_dep.yaml @@ -8,6 +8,13 @@ # In an environment where a platform might build in different operating systems, it is recommended to set # the scope for the appropriate CodeQL external dependency based on the host operating system being used. # +# ****VERSION UPDATE INSTRUCTIONS**** +# +# When updating the CodeQL CLI used here, update the corresponding codeql/cpp-queries version in CodeQlQueries.qls. +# Visit the `qlpack.yml` in the release branch for the CodeQL CLI to get the version to use there. For example, the +# CodeQL CLI 2.18.1 file is https://github.com/github/codeql/blob/codeql-cli-2.18.1/cpp/ql/src/qlpack.yml and the +# pack version there is 1.1.0. +# # Copyright (c) Microsoft Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent ## diff --git a/BaseTools/Plugin/CodeQL/codeqlcli_linux_ext_dep.yaml b/BaseTools/Plugin/CodeQL/codeqlcli_linux_ext_dep.yaml index 1972cde74b..e3fd40c2e1 100644 --- a/BaseTools/Plugin/CodeQL/codeqlcli_linux_ext_dep.yaml +++ b/BaseTools/Plugin/CodeQL/codeqlcli_linux_ext_dep.yaml @@ -6,6 +6,13 @@ # systems, it is recommended to set the scope for the appropriate CodeQL external dependency based on the # host operating system being used. # +# ****VERSION UPDATE INSTRUCTIONS**** +# +# When updating the CodeQL CLI used here, update the corresponding codeql/cpp-queries version in CodeQlQueries.qls. +# Visit the `qlpack.yml` in the release branch for the CodeQL CLI to get the version to use there. For example, the +# CodeQL CLI 2.18.1 file is https://github.com/github/codeql/blob/codeql-cli-2.18.1/cpp/ql/src/qlpack.yml and the +# pack version there is 1.1.0. +# # Copyright (c) Microsoft Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent ## diff --git a/BaseTools/Plugin/CodeQL/codeqlcli_windows_ext_dep.yaml b/BaseTools/Plugin/CodeQL/codeqlcli_windows_ext_dep.yaml index 28ad30e790..5e6add84f4 100644 --- a/BaseTools/Plugin/CodeQL/codeqlcli_windows_ext_dep.yaml +++ b/BaseTools/Plugin/CodeQL/codeqlcli_windows_ext_dep.yaml @@ -6,6 +6,13 @@ # systems, it is recommended to set the scope for the appropriate CodeQL external dependency based on the # host operating system being used. # +# ****VERSION UPDATE INSTRUCTIONS**** +# +# When updating the CodeQL CLI used here, update the corresponding codeql/cpp-queries version in CodeQlQueries.qls. +# Visit the `qlpack.yml` in the release branch for the CodeQL CLI to get the version to use there. For example, the +# CodeQL CLI 2.18.1 file is https://github.com/github/codeql/blob/codeql-cli-2.18.1/cpp/ql/src/qlpack.yml and the +# pack version there is 1.1.0. +# # Copyright (c) Microsoft Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent ## -- cgit v1.2.3