fix(yq): restore default version, reverting #405

The new version of yq is quite breaking, as it requires '-oj -r' for continued operation in rules_oci. We can do a default version flip later when more downstream projects are compatible.
bazel-contrib · May 5, 2023 · 49b3187 · 49b3187
1 parent 3d0a0fc
commit 49b3187
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/docs/repositories.md b/docs/repositories.md
diff --git a/lib/private/yq_toolchain.bzl b/lib/private/yq_toolchain.bzl
@@ -48,7 +48,9 @@ YQ_PLATFORMS = {
     ),
 }
 
-DEFAULT_YQ_VERSION = "4.33.3"
+# Note: this is not the latest release, because it has significant breaking changes.
+# See https://github.com/aspect-build/bazel-lib/pull/421
+DEFAULT_YQ_VERSION = "4.25.2"
 
 # https://github.com/mikefarah/yq/releases
 #

diff --git a/lib/tests/yq/BUILD.bazel b/lib/tests/yq/BUILD.bazel
@@ -66,7 +66,7 @@ diff_test(
 yq(
     name = "case_convert_json_to_yaml",
     srcs = ["//lib/tests/jq:a_pretty.json"],
-    args = ["-p=json"],
+    args = ["-P"],
     expression = ".",
 )
 
@@ -252,7 +252,7 @@ diff_test(
 yq(
     name = "case_convert_xml_to_yaml",
     srcs = ["sample.xml"],
-    args = ["-p=xml --xml-skip-proc-inst"],
+    args = ["-p=xml"],
     expression = ".",
 )
 
@@ -298,7 +298,7 @@ yq(
         "//lib/tests/jq:a.json",
         "//lib/tests/jq:b.json",
     ],
-    args = ["-p=json"],
+    args = ["-P"],
     expression = ". as $item ireduce ({}; . * $item )",
 )