Skip to content

Commit 0bd1c59

Browse files
Copilotphlax
andcommitted
Fix jq context issue by preserving source reference throughout pipeline
Co-authored-by: phlax <454682+phlax@users.noreply.github.com>
1 parent fbfa493 commit 0bd1c59

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

.github/workflows/_bazel_registry.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,27 +89,26 @@ jobs:
8989
input: ${{ inputs.modules-root }}/modules/${{ inputs.module }}/${{ matrix.version }}/${{ inputs.source }}
9090
input-format: json-path
9191
filter: |
92-
.
92+
. as $source
9393
| ${{ steps.source.outputs.output }} as $actual
9494
9595
# Check main integrity
96-
| if .integrity != $actual.integrity then
96+
| (if $source.integrity != $actual.integrity then
9797
{
98-
result: "::error::✗ Integrity does not match (actual: \($actual.integrity), expected: \(.integrity))",
98+
result: "::error::✗ Integrity does not match (actual: \($actual.integrity), expected: \($source.integrity))",
9999
error: true
100100
}
101101
else
102102
{
103103
result: "✓ Integrity matches \($actual.integrity)",
104104
error: false
105105
}
106-
end
107-
| [.] as $checks
106+
end) as $integrity_check
108107
109108
# Check overlay files
110-
| if .overlay then
111-
$checks + [
112-
.overlay
109+
| (if $source.overlay then
110+
[
111+
$source.overlay
113112
| to_entries[]
114113
| . as $entry
115114
| if $actual["overlay:\($entry.key)"] then
@@ -135,14 +134,13 @@ jobs:
135134
end
136135
]
137136
else
138-
$checks
139-
end
140-
| . as $checks
137+
[]
138+
end) as $overlay_checks
141139
142140
# Check patch files
143-
| if .patches then
144-
$checks + [
145-
.patches
141+
| (if $source.patches then
142+
[
143+
$source.patches
146144
| to_entries[]
147145
| . as $entry
148146
| if $actual["patches:\($entry.key)"] then
@@ -168,9 +166,11 @@ jobs:
168166
end
169167
]
170168
else
171-
$checks
172-
end
173-
| . as $checks
169+
[]
170+
end) as $patch_checks
171+
172+
# Combine all checks
173+
| ([$integrity_check] + $overlay_checks + $patch_checks) as $checks
174174
175175
# Determine if any errors occurred
176176
| ($checks | map(select(.error)) | length > 0) as $has_errors

0 commit comments

Comments
 (0)