Skip to content

Commit 9a0eef7

Browse files
committed
actions: use US spelling in lockfile-aware pinning comments
behaviour -> behavior, recognised -> recognized, serialises -> serializes across the lockfile-aware pinning comments and change notes. Comments/docs only; no logic change.
1 parent 5ae6d72 commit 9a0eef7

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

actions/extractor/tools/lockfile-extension-generator/generator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type row struct {
3939
// shorter, mutable tag such as `v4` or `v4.3` in `uses:`. The query matches on
4040
// the ref exactly as written, so for every full-semver resolved ref we also
4141
// emit its major-only (`v4`) and major.minor (`v4.3`) forms. This lets a
42-
// `uses: owner/action@v4` be recognised as pinned by a lockfile entry that
42+
// `uses: owner/action@v4` be recognized as pinned by a lockfile entry that
4343
// resolved to `v4.3.1`, which is the common real-world case.
4444
func rowsFromLockfile(contents []byte) ([]row, error) {
4545
doc, err := parseLockfile(contents)
@@ -101,7 +101,7 @@ func refVariants(ref string) []string {
101101
return variants
102102
}
103103

104-
// renderExtension serialises `rows` as a CodeQL data-extension YAML document that
104+
// renderExtension serializes `rows` as a CodeQL data-extension YAML document that
105105
// adds to the `pinnedByLockfileDataModel` extensible predicate in
106106
// `codeql/actions-all`.
107107
func renderExtension(rows []row) string {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
category: minorAnalysis
33
---
4-
* Added a new extensible predicate `pinnedByLockfileDataModel(workflow_path, nwo, ref)`, which records `uses:` references that are pinned by a repository's Actions lockfile (`.github/workflows/actions.lock`). The CodeQL Actions extractor generates this data at database-creation time into a database-local model pack (`codeql/actions-lockfile-pins`); it has no effect unless that pack is supplied to analysis (for example via `--model-packs`), so behaviour is unchanged for repositories without a lockfile or analyses that do not opt in.
4+
* Added a new extensible predicate `pinnedByLockfileDataModel(workflow_path, nwo, ref)`, which records `uses:` references that are pinned by a repository's Actions lockfile (`.github/workflows/actions.lock`). The CodeQL Actions extractor generates this data at database-creation time into a database-local model pack (`codeql/actions-lockfile-pins`); it has no effect unless that pack is supplied to analysis (for example via `--model-packs`), so behavior is unchanged for repositories without a lockfile or analyses that do not opt in.

actions/ql/lib/codeql/actions/config/ConfigExtensions.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ extensible predicate trustedActionsOwnerDataModel(string owner);
7878
* `github.com/github/actions-lockfile/go`. Each lockfile entry binds an `nwo`@`ref` to a
7979
* verified commit SHA, which is exactly the pinning evidence the `actions/unpinned-tag` query
8080
* otherwise lacks. Until the extractor populates this predicate it is empty, so any clause that
81-
* consumes it is a clean no-op and behaviour is unchanged for repositories without a lockfile.
81+
* consumes it is a clean no-op and behavior is unchanged for repositories without a lockfile.
8282
*
8383
* Fields:
8484
* - `workflow_path`: repo-relative path of the file containing the `uses:` reference,

actions/ql/lib/ext/config/pinned_by_lockfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ extensions:
1515
# - [".github/workflows/ci.yml", "actions/checkout", "v4"]
1616
#
1717
# Until the extractor populates this predicate it stays empty, so the
18-
# `not pinnedByLockfile(...)` clause in `actions/unpinned-tag` is a no-op and behaviour is
18+
# `not pinnedByLockfile(...)` clause in `actions/unpinned-tag` is a no-op and behavior is
1919
# unchanged for repositories without a lockfile.
2020
data: []
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
category: minorAnalysis
33
---
4-
* The `actions/unpinned-tag` query no longer reports `uses:` references that are recorded as pinned by a repository's Actions lockfile (`.github/workflows/actions.lock`) via the new `pinnedByLockfileDataModel` extensible predicate. The CodeQL Actions extractor generates this data at database-creation time into a database-local model pack (`codeql/actions-lockfile-pins`); references are suppressed only when that pack is supplied to analysis (for example via `--model-packs`), so behaviour is unchanged for repositories without a lockfile or analyses that do not opt in. Because the lockfile keys its pins transitively by workflow path, a stale lockfile could in rare cases suppress a directly-written unpinned tag that shares an action and major version with a transitively-pinned dependency of the same workflow; keeping the lockfile current avoids this.
4+
* The `actions/unpinned-tag` query no longer reports `uses:` references that are recorded as pinned by a repository's Actions lockfile (`.github/workflows/actions.lock`) via the new `pinnedByLockfileDataModel` extensible predicate. The CodeQL Actions extractor generates this data at database-creation time into a database-local model pack (`codeql/actions-lockfile-pins`); references are suppressed only when that pack is supplied to analysis (for example via `--model-packs`), so behavior is unchanged for repositories without a lockfile or analyses that do not opt in. Because the lockfile keys its pins transitively by workflow path, a stale lockfile could in rare cases suppress a directly-written unpinned tag that shares an action and major version with a transitively-pinned dependency of the same workflow; keeping the lockfile current avoids this.

0 commit comments

Comments
 (0)