Skip to content

Commit dd09b67

Browse files
committed
Fix missing pack dependency upgrades
1 parent 69cf799 commit dd09b67

File tree

11 files changed

+28
-22
lines changed

11 files changed

+28
-22
lines changed

javascript/frameworks/cap/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ suites: codeql-suites
66
extractor: javascript
77
dependencies:
88
codeql/javascript-all: "^2.6.24"
9-
advanced-security/javascript-sap-cap-all: "2.25.0"
9+
advanced-security/javascript-sap-cap-all: "2.25.1"
1010
default-suite-file: codeql-suites/javascript-code-scanning.qls

javascript/frameworks/cap/test/qlpack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ version: 2.25.1
44
extractor: javascript
55
dependencies:
66
codeql/javascript-all: "^2.6.24"
7-
advanced-security/javascript-sap-cap-queries: "2.25.0"
8-
advanced-security/javascript-sap-cap-models: "2.25.0"
9-
advanced-security/javascript-sap-cap-all: "2.25.0"
7+
advanced-security/javascript-sap-cap-queries: "2.25.1"
8+
advanced-security/javascript-sap-cap-models: "2.25.1"
9+
advanced-security/javascript-sap-cap-all: "2.25.1"

javascript/frameworks/ui5-webcomponents/test/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ version: 2.25.1
33
extractor: javascript
44
dependencies:
55
codeql/javascript-all: "^2.6.24"
6-
advanced-security/javascript-sap-ui5-all: "2.25.0"
6+
advanced-security/javascript-sap-ui5-all: "2.25.1"

javascript/frameworks/ui5/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ suites: codeql-suites
66
extractor: javascript
77
dependencies:
88
codeql/javascript-all: "^2.6.24"
9-
advanced-security/javascript-sap-ui5-all: "2.25.0"
9+
advanced-security/javascript-sap-ui5-all: "2.25.1"
1010
default-suite-file: codeql-suites/javascript-code-scanning.qls

javascript/frameworks/ui5/test/qlpack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ dependencies:
77
# no overlap occurs with the SAP UI5 queries. We therefore allow any version
88
# greater than or equal to 1.2.0, as major breaking changes are not a concern.
99
codeql/javascript-queries: ">1.2.0"
10-
advanced-security/javascript-sap-ui5-queries: "2.25.0"
11-
advanced-security/javascript-sap-ui5-models: "2.25.0"
12-
advanced-security/javascript-sap-ui5-all: "2.25.0"
10+
advanced-security/javascript-sap-ui5-queries: "2.25.1"
11+
advanced-security/javascript-sap-ui5-models: "2.25.1"
12+
advanced-security/javascript-sap-ui5-all: "2.25.1"

javascript/frameworks/xsjs/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ suites: codeql-suites
66
extractor: javascript
77
dependencies:
88
codeql/javascript-all: "^2.6.24"
9-
advanced-security/javascript-sap-xsjs-all: "2.25.0"
9+
advanced-security/javascript-sap-xsjs-all: "2.25.1"
1010
default-suite-file: codeql-suites/javascript-code-scanning.qls

javascript/frameworks/xsjs/test/qlpack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ version: 2.25.1
44
extractor: javascript
55
dependencies:
66
codeql/javascript-all: "^2.6.24"
7-
advanced-security/javascript-sap-xsjs-queries: "2.25.0"
8-
advanced-security/javascript-sap-xsjs-all: "2.25.0"
9-
advanced-security/javascript-sap-xsjs-models: "2.25.0"
7+
advanced-security/javascript-sap-xsjs-queries: "2.25.1"
8+
advanced-security/javascript-sap-xsjs-all: "2.25.1"
9+
advanced-security/javascript-sap-xsjs-models: "2.25.1"

javascript/heuristic-models/tests/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ version: 2.25.1
55
extractor: javascript
66
dependencies:
77
"codeql/javascript-all": "^2.6.24"
8-
"advanced-security/javascript-heuristic-models": "2.25.0"
8+
"advanced-security/javascript-heuristic-models": "2.25.1"

scripts/install-packs.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +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-
find "${REPO_ROOT}/${framework_path}" -name "qlpack.yml" -type f | sort | while read -r qlpack_file; do
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
9697
local pack_dir
9798
pack_dir=$(dirname "${qlpack_file}")
9899
# Use relative path for cleaner output

scripts/update-release-version.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,10 @@ update_qlt_config() {
258258
}
259259

260260
## Update internal dependency references in a qlpack.yml file
261-
## e.g., advanced-security/javascript-sap-cap-models: "^2.3.0" -> "^2.4.0"
262-
## e.g., advanced-security/javascript-sap-cap-models: "^2.3.0" -> "^2.4.0-alpha"
263-
## and advanced-security/javascript-heuristic-models: 2.3.0 -> 2.4.0
261+
## Handles three observed formats:
262+
## pack_name: "X.Y.Z" (unquoted key, quoted value — most common)
263+
## "pack_name": "X.Y.Z" (quoted key and value — heuristic-models)
264+
## pack_name: X.Y.Z (unquoted key and value — rare/legacy)
264265
update_internal_deps() {
265266
local file="$1"
266267
local old_version="$2"
@@ -271,10 +272,13 @@ update_internal_deps() {
271272
escaped_old_version=$(printf '%s' "${old_version}" | sed 's/\./\\./g')
272273

273274
for pack_name in "${INTERNAL_PACKS[@]}"; do
274-
# Update quoted caret-prefixed versions: "^X.Y.Z"
275-
sed -i.bak "s|${pack_name}: \"\\^${escaped_old_version}\"|${pack_name}: \"^${new_version}\"|g" "${file}"
275+
# Update quoted exact versions: pack_name: "X.Y.Z"
276+
sed -i.bak "s|${pack_name}: \"${escaped_old_version}\"|${pack_name}: \"${new_version}\"|g" "${file}"
276277
rm -f "${file}.bak"
277-
# Update unquoted exact versions: X.Y.Z
278+
# Update quoted key + quoted value: "pack_name": "X.Y.Z"
279+
sed -i.bak "s|\"${pack_name}\": \"${escaped_old_version}\"|\"${pack_name}\": \"${new_version}\"|g" "${file}"
280+
rm -f "${file}.bak"
281+
# Update unquoted exact versions: pack_name: X.Y.Z
278282
sed -i.bak "s|${pack_name}: ${escaped_old_version}$|${pack_name}: ${new_version}|g" "${file}"
279283
rm -f "${file}.bak"
280284
done

0 commit comments

Comments
 (0)