Merge pull request #6497 from IntersectMBO/fix/yq-deprecated-tojson-flag

Jimbo4350 · web-flow · commit 6ef9dd5b41f9 · 2026-03-25T13:04:27.000Z
Fix check-git-dependencies for indented source-repository-package stanzas
diff --git a/.github/bin/check-git-dependencies b/.github/bin/check-git-dependencies
@@ -23,8 +23,8 @@ commits () {
   done
 }
 
-grep '\(^source-repository-package\|^ *location:\|^ *tag:\)' cabal.project | sed 's|^source-repository-package|-|g' | \
-  yq eval -P -j \
+grep '\(^ *source-repository-package\|^ *location:\|^ *tag:\)' cabal.project | sed 's|^ *source-repository-package|-|g' | \
+  yq eval -P -o=json \
   > tmp/repositories.json
 
 for row in $(cat tmp/repositories.json | jq -r '.[] | @base64'); do

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ commits () {`
`23`	`23`	`done`
`24`	`24`	`}`
`25`	`25`
`26`		`-grep '\(^source-repository-package\\|^ location:\\|^ tag:\)' cabal.project \| sed 's\|^source-repository-package\|-\|g' \| \`
`27`		`- yq eval -P -j \`
	`26`	`+grep '\(^ source-repository-package\\|^ location:\\|^ tag:\)' cabal.project \| sed 's\|^ source-repository-package\|-\|g' \| \`
	`27`	`+ yq eval -P -o=json \`
`28`	`28`	`> tmp/repositories.json`
`29`	`29`
`30`	`30`	`for row in $(cat tmp/repositories.json \| jq -r '.[] \| @base64'); do`