Skip to content

Commit 3d4c5f7

Browse files
Copilotdata-douser
andauthored
Apply review feedback: prune .codeql dirs in find commands, fix header comment
Agent-Logs-Url: https://github.com/advanced-security/codeql-sap-js/sessions/93266b27-a206-4d43-b0f8-a8dd7b7147f5 Co-authored-by: data-douser <70299490+data-douser@users.noreply.github.com>
1 parent dd09b67 commit 3d4c5f7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

scripts/install-packs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ install_framework() {
9292
echo "Installing packs for: ${framework_path}"
9393

9494
# Find all qlpack.yml files under this framework and install their packs
95-
# Exclude .codeql cache directories which contain cached pack dependencies
96-
find "${REPO_ROOT}/${framework_path}" -name "qlpack.yml" -not -path "*/.codeql/*" -type f | sort | while read -r qlpack_file; do
95+
# Exclude .codeql cache directories which contain cached pack dependencies by pruning them
96+
find "${REPO_ROOT}/${framework_path}" -name .codeql -type d -prune -o -name "qlpack.yml" -type f -print | sort | while read -r qlpack_file; do
9797
local pack_dir
9898
pack_dir=$(dirname "${qlpack_file}")
9999
# Use relative path for cleaner output

scripts/update-release-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set -euo pipefail
2424
##
2525
## Additionally updates:
2626
## - Internal dependency references within qlpack.yml files
27-
## that reference other packs in this repository (e.g., ^X.Y.Z constraints).
27+
## that reference other packs in this repository (exact X.Y.Z versions).
2828
## - qlt.conf.json (CodeQLCLI, CodeQLStandardLibrary, CodeQLCLIBundle)
2929
## using the base version (X.Y.Z) derived by stripping any pre-release suffix.
3030
##

scripts/upgrade-packs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ upgrade_framework() {
9292
echo "Upgrading packs for: ${framework_path}"
9393

9494
# Find all qlpack.yml files under this framework and upgrade their packs
95-
# Exclude .codeql cache directories which contain cached pack dependencies
96-
find "${REPO_ROOT}/${framework_path}" -name "qlpack.yml" -not -path "*/.codeql/*" -type f | sort | while read -r qlpack_file; do
95+
# Exclude .codeql cache directories which contain cached pack dependencies by pruning them
96+
find "${REPO_ROOT}/${framework_path}" -path '*/.codeql' -prune -o -name 'qlpack.yml' -type f -print | sort | while read -r qlpack_file; do
9797
local pack_dir
9898
pack_dir=$(dirname "${qlpack_file}")
9999
# Use relative path for cleaner output

0 commit comments

Comments
 (0)