Skip to content

Commit cd68019

Browse files
committed
Fix update-release-version.sh for no carets
Fixes the update-release-version.sh script to update CodeQL pack dependency versions in sync with CodeQL CLI version when a pack dependency points to an explicit pack version vice a semver range or (greater than) caret. Fixes the cause of the version mismatch fixed by PR #352.
1 parent 71bb397 commit cd68019

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

scripts/update-release-version.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,11 @@ 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 all YAML key-value formats used across qlpack files:
262+
## e.g., advanced-security/javascript-sap-cap-models: "^2.3.0" -> "^2.4.0"
263+
## e.g., advanced-security/javascript-sap-cap-models: "2.3.0" -> "2.4.0"
264+
## e.g., "advanced-security/javascript-heuristic-models": "2.3.0" -> ... (quoted key)
265+
## and advanced-security/javascript-heuristic-models: 2.3.0 -> 2.4.0
264266
update_internal_deps() {
265267
local file="$1"
266268
local old_version="$2"
@@ -271,11 +273,14 @@ update_internal_deps() {
271273
escaped_old_version=$(printf '%s' "${old_version}" | sed 's/\./\\./g')
272274

273275
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}"
276+
# Update quoted caret-prefixed versions: "^X.Y.Z" (pack name optionally quoted)
277+
sed -i.bak "s|\"\\{0,1\\}${pack_name}\"\\{0,1\\}: \"\\^${escaped_old_version}\"|${pack_name}: \"^${new_version}\"|g" "${file}"
276278
rm -f "${file}.bak"
277-
# Update unquoted exact versions: X.Y.Z
278-
sed -i.bak "s|${pack_name}: ${escaped_old_version}$|${pack_name}: ${new_version}|g" "${file}"
279+
# Update quoted exact versions: "X.Y.Z" (pack name optionally quoted)
280+
sed -i.bak "s|\"\\{0,1\\}${pack_name}\"\\{0,1\\}: \"${escaped_old_version}\"|${pack_name}: \"${new_version}\"|g" "${file}"
281+
rm -f "${file}.bak"
282+
# Update unquoted exact versions: X.Y.Z (pack name optionally quoted)
283+
sed -i.bak "s|\"\\{0,1\\}${pack_name}\"\\{0,1\\}: ${escaped_old_version}$|${pack_name}: ${new_version}|g" "${file}"
279284
rm -f "${file}.bak"
280285
done
281286
}

0 commit comments

Comments
 (0)