From d5638991c81f81b1757b24c740b58344efb2dbc0 Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Wed, 13 Oct 2021 00:10:07 -0300 Subject: [PATCH] fix: gofish with multiple binaries Signed-off-by: Carlos A Becker --- internal/pipe/gofish/food_template.go | 2 +- .../gofish/testdata/TestFullFood.lua.golden | 36 +++++++++---------- .../testdata/TestFullFoodLinuxOnly.lua.golden | 18 +++++----- .../TestFullFoodWindowsOnly.lua.golden | 6 ++-- .../testdata/TestFullPipe/default.lua.golden | 2 +- .../TestFullPipe/default_gitlab.lua.golden | 2 +- .../multiple_armv5.lua.golden | 6 ++-- .../multiple_armv6.lua.golden | 6 ++-- .../multiple_armv7.lua.golden | 6 ++-- .../TestRunPipeNameTemplate.lua.golden | 2 +- .../TestRunPipeUniversalBinary.lua.golden | 4 +-- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/internal/pipe/gofish/food_template.go b/internal/pipe/gofish/food_template.go index 410133ed4..66d8649fa 100644 --- a/internal/pipe/gofish/food_template.go +++ b/internal/pipe/gofish/food_template.go @@ -42,7 +42,7 @@ food = { {{- if ne $element.OS "windows"}} executable = true {{- end }} - } + }, {{- end }} } }, diff --git a/internal/pipe/gofish/testdata/TestFullFood.lua.golden b/internal/pipe/gofish/testdata/TestFullFood.lua.golden index f7b7cb6ed..d37ad4ec1 100644 --- a/internal/pipe/gofish/testdata/TestFullFood.lua.golden +++ b/internal/pipe/gofish/testdata/TestFullFood.lua.golden @@ -18,17 +18,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -41,17 +41,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -64,17 +64,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -87,17 +87,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -110,17 +110,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -132,15 +132,15 @@ food = { { path = "bin1.exe", installpath = "bin\\bin1.exe", - } + }, { path = "bin2.exe", installpath = "bin\\bin2.exe", - } + }, { path = "bin3.exe", installpath = "bin\\bin3.exe", - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestFullFoodLinuxOnly.lua.golden b/internal/pipe/gofish/testdata/TestFullFoodLinuxOnly.lua.golden index 959a1e9b6..272b49427 100644 --- a/internal/pipe/gofish/testdata/TestFullFoodLinuxOnly.lua.golden +++ b/internal/pipe/gofish/testdata/TestFullFoodLinuxOnly.lua.golden @@ -18,17 +18,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -41,17 +41,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, { @@ -64,17 +64,17 @@ food = { path = "bin1", installpath = "bin/bin1", executable = true - } + }, { path = "bin2", installpath = "bin/bin2", executable = true - } + }, { path = "bin3", installpath = "bin/bin3", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestFullFoodWindowsOnly.lua.golden b/internal/pipe/gofish/testdata/TestFullFoodWindowsOnly.lua.golden index 40a663032..c0d3664e3 100644 --- a/internal/pipe/gofish/testdata/TestFullFoodWindowsOnly.lua.golden +++ b/internal/pipe/gofish/testdata/TestFullFoodWindowsOnly.lua.golden @@ -17,15 +17,15 @@ food = { { path = "bin1.exe", installpath = "bin\\bin1.exe", - } + }, { path = "bin2.exe", installpath = "bin\\bin2.exe", - } + }, { path = "bin3.exe", installpath = "bin\\bin3.exe", - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestFullPipe/default.lua.golden b/internal/pipe/gofish/testdata/TestFullPipe/default.lua.golden index 4ae0e21dd..3bff93878 100644 --- a/internal/pipe/gofish/testdata/TestFullPipe/default.lua.golden +++ b/internal/pipe/gofish/testdata/TestFullPipe/default.lua.golden @@ -18,7 +18,7 @@ food = { path = "name", installpath = "bin/name", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestFullPipe/default_gitlab.lua.golden b/internal/pipe/gofish/testdata/TestFullPipe/default_gitlab.lua.golden index a642a846b..eb00e3c3b 100644 --- a/internal/pipe/gofish/testdata/TestFullPipe/default_gitlab.lua.golden +++ b/internal/pipe/gofish/testdata/TestFullPipe/default_gitlab.lua.golden @@ -18,7 +18,7 @@ food = { path = "name", installpath = "bin/name", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.lua.golden b/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.lua.golden index 230b57675..b27dcae22 100644 --- a/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.lua.golden +++ b/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.lua.golden @@ -18,7 +18,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, { @@ -31,7 +31,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, { @@ -44,7 +44,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.lua.golden b/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.lua.golden index c4460814d..882de7133 100644 --- a/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.lua.golden +++ b/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.lua.golden @@ -18,7 +18,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, { @@ -31,7 +31,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, { @@ -44,7 +44,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.lua.golden b/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.lua.golden index 667493332..f99c6fd3b 100644 --- a/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.lua.golden +++ b/internal/pipe/gofish/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.lua.golden @@ -18,7 +18,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, { @@ -31,7 +31,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, { @@ -44,7 +44,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestRunPipeNameTemplate.lua.golden b/internal/pipe/gofish/testdata/TestRunPipeNameTemplate.lua.golden index 4bc889dd7..a6ed0b62d 100644 --- a/internal/pipe/gofish/testdata/TestRunPipeNameTemplate.lua.golden +++ b/internal/pipe/gofish/testdata/TestRunPipeNameTemplate.lua.golden @@ -18,7 +18,7 @@ food = { path = "foo", installpath = "bin/foo", executable = true - } + }, } }, } diff --git a/internal/pipe/gofish/testdata/TestRunPipeUniversalBinary.lua.golden b/internal/pipe/gofish/testdata/TestRunPipeUniversalBinary.lua.golden index 545c84382..9b2e08d1b 100644 --- a/internal/pipe/gofish/testdata/TestRunPipeUniversalBinary.lua.golden +++ b/internal/pipe/gofish/testdata/TestRunPipeUniversalBinary.lua.golden @@ -18,7 +18,7 @@ food = { path = "unibin", installpath = "bin/unibin", executable = true - } + }, } }, { @@ -31,7 +31,7 @@ food = { path = "unibin", installpath = "bin/unibin", executable = true - } + }, } }, }