Merge branch 'origin/main' into 'next-release/main'

2026-04-15 01:41:56 +00:00 · 2026-01-20 07:44:39 +00:00
parent 0ca0581428 cd88723b2d
commit fd2c1bee1d
1 changed files with 1 additions and 1 deletions
--- a/pipeline/frontend/yaml/types/base/slice_test.go
+++ b/pipeline/frontend/yaml/types/base/slice_test.go
@@ -36,7 +36,7 @@ func TestStringOrSliceYaml(t *testing.T) {
 		assert.Equal(t, StringOrSlice{"bar", "baz"}, s.Foo)

 		d, err := yaml.Marshal(&s)
-		assert.Nil(t, err)
+		assert.NoError(t, err)

 		s2 := StructStringOrSlice{}
 		assert.NoError(t, yaml.Unmarshal(d, &s2))