fix: fix yq windows issues by bumping version

This commit is contained in:
= 2022-05-31 10:51:12 -07:00 committed by Derek Cormier
parent 9a1edce1aa
commit 7017045707
4 changed files with 12 additions and 23 deletions

View File

@ -12,11 +12,7 @@ tasks:
test_targets:
- "//..."
windows:
build_flags:
- "--build_tag_filters=-no-windows-ci"
build_targets:
- "//..."
test_flags:
- "--test_tag_filters=-no-windows-ci"
test_targets:
- "//..."

View File

@ -66,5 +66,5 @@ def bazel_lib_internal_deps():
)
# Register toolchains for tests
register_jq_toolchains(version = "1.6")
register_yq_toolchains(version = "4.24.5")
register_jq_toolchains()
register_yq_toolchains()

View File

@ -48,7 +48,7 @@ YQ_PLATFORMS = {
),
}
DEFAULT_YQ_VERSION = "4.24.5"
DEFAULT_YQ_VERSION = "4.25.2"
# https://github.com/mikefarah/yq/releases
#
@ -59,6 +59,15 @@ DEFAULT_YQ_VERSION = "4.24.5"
# Alternatively, you can compute them manually by running
# `shasum -b -a 384 [downloaded file] | awk '{ print $1 }' | xxd -r -p | base64`
YQ_VERSIONS = {
"4.25.2": {
"darwin_amd64": "sha384-JOSKdcN5JoSfryJBDFzTSk21uFVNw+bWdLHTErwIyaUOAZZV9LISzlmsYiQoPfo3",
"darwin_arm64": "sha384-COVD0Ko3vQUmSS/SS17VrpA4gTaxuyszgPfE9P8vNKLlB+65I7HznstHg/iElxrk",
"linux_amd64": "sha384-uK7+qPUYBO1bnKUNYKqKuGpfTKsRktfptGATlV14AFb5hiVp6vcWvDyTRSfiZn5f",
"linux_arm64": "sha384-2SwY2OtotYhupSEeUSHRKTMbUoIhUyIt7QgujH3UyaQ/9AoXWNZ3h05OAdWL5WbL",
"linux_s390x": "sha384-AXZe1USYMi0mg5ylHnU8OGqQQZcMDETD/bLWG0BKytSBhZ0Xkkhn9r90fJYM4xVS",
"linux_ppc64le": "sha384-N6UXrIzrpPy6zojzI8J7AFP5z3UAe9KU8WLuUKe8WrttuD1Fl3YTwvo/OM2+5NTt",
"windows_amd64": "sha384-wD0GpKHTLQIWWNJv43ts+l2rIdAiyYYtb3upncdIOLLydFcWxB39+thcQ8aSdaW+",
},
"4.24.5": {
"darwin_amd64": "sha384-Y6Utm9NAX7q69apRHLAU6oNYk5Kn5b6LUccBolbTm2CXXYye8pabeFPsaREFIHbw",
"darwin_arm64": "sha384-d6+hFiZrsUeqnXJufnvadTi0BL/sfbd6K7LnJyLVDy31C0isjyHipVqlibKYbFSu",

View File

@ -81,16 +81,12 @@ yq(
name = "case_generate_from_expression",
srcs = [],
expression = ".a.b.c = \"cat\"",
# yq hangs without input srcs (https://github.com/mikefarah/yq/issues/1177)
tags = ["no-windows-ci"],
)
diff_test(
name = "case_generate_from_expression_test",
file1 = "generated-from-expression.yaml",
file2 = ":case_generate_from_expression",
# yq hangs without input srcs (https://github.com/mikefarah/yq/issues/1177)
tags = ["no-windows-ci"],
)
# No sources produces empty file (equivalent to --null-input)
@ -98,16 +94,12 @@ yq(
name = "case_no_sources",
srcs = [],
expression = ".",
# yq hangs without input srcs (https://github.com/mikefarah/yq/issues/1177)
tags = ["no-windows-ci"],
)
diff_test(
name = "case_no_sources_test",
file1 = ":case_no_sources",
file2 = "empty.yaml",
# yq hangs without input srcs (https://github.com/mikefarah/yq/issues/1177)
tags = ["no-windows-ci"],
)
# Merge two documents together
@ -134,16 +126,12 @@ yq(
"b.yaml",
],
expression = ". as $item ireduce ({}; . * $item )",
# TODO: figure out why this doesn't work on windows (may be related to https://github.com/mikefarah/yq/issues/747)
tags = ["no-windows-ci"],
)
diff_test(
name = "case_merge_expression_alt_test",
file1 = "a_b_merged.yaml",
file2 = ":case_merge_expression_alt",
# TODO: figure out why this doesn't work on windows (may be related to https://github.com/mikefarah/yq/issues/747)
tags = ["no-windows-ci"],
)
# Split into multiple documents
@ -312,16 +300,12 @@ yq(
],
args = ["-P"],
expression = ". as $item ireduce ({}; . * $item )",
# TODO: figure out why this doesn't work on windows (may be related to https://github.com/mikefarah/yq/issues/747)
tags = ["no-windows-ci"],
)
diff_test(
name = "case_merge_expression_json_test",
file1 = "a_b_merged.yaml",
file2 = ":case_merge_expression_json",
# TODO: figure out why this doesn't work on windows (may be related to https://github.com/mikefarah/yq/issues/747)
tags = ["no-windows-ci"],
)
# Call yq within a genrule