From 2d5f752936e144967e4ba176d8e3bb7166f27e2c Mon Sep 17 00:00:00 2001 From: Gareth Evans Date: Thu, 10 Feb 2022 08:11:05 +0000 Subject: [PATCH 1/3] Add in pre-release information for tomee versions --- actions/tomee-dependency/main.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/actions/tomee-dependency/main.go b/actions/tomee-dependency/main.go index 1d91588a..adcf467d 100644 --- a/actions/tomee-dependency/main.go +++ b/actions/tomee-dependency/main.go @@ -66,9 +66,27 @@ func main() { panic(err) } + latestVersion, err := versions.GetLatestVersion(inputs) + if err != nil { + panic(err) + } + if o, err := versions.GetLatest(inputs); err != nil { panic(err) } else { + // override the version with the full string (including prerelease information) + if latestVersion.Prerelease() != "" { + o["version"] = latestVersion.String() + } o.Write(os.Stdout) } } + +func GetLatest(v actions.Versions, inputs actions.Inputs, mods ...actions.RequestModifierFunc) (actions.Outputs, error) { + latestVersion, err := v.GetLatestVersion(inputs) + if err != nil { + return nil, err + } + + return actions.NewOutputs(v[latestVersion.Original()], latestVersion, nil, mods...) +} From 3fb8cc20826057913aeb7f4b1ea3f15e6063341e Mon Sep 17 00:00:00 2001 From: Gareth Evans Date: Thu, 10 Feb 2022 19:46:06 +0000 Subject: [PATCH 2/3] Update actions/tomee-dependency/main.go Co-authored-by: Daniel Mikusa --- actions/tomee-dependency/main.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/actions/tomee-dependency/main.go b/actions/tomee-dependency/main.go index adcf467d..106d3ef7 100644 --- a/actions/tomee-dependency/main.go +++ b/actions/tomee-dependency/main.go @@ -71,15 +71,16 @@ func main() { panic(err) } - if o, err := versions.GetLatest(inputs); err != nil { + o, err := actions.NewOutputs(versions[latestVersion.Original()], latestVersion, nil) + if err != nil { panic(err) - } else { - // override the version with the full string (including prerelease information) - if latestVersion.Prerelease() != "" { - o["version"] = latestVersion.String() - } - o.Write(os.Stdout) } + + // override the version with the full string (including prerelease information) + if latestVersion.Prerelease() != "" { + o["version"] = latestVersion.String() + } + o.Write(os.Stdout) } func GetLatest(v actions.Versions, inputs actions.Inputs, mods ...actions.RequestModifierFunc) (actions.Outputs, error) { From e2499c4135c9c1db24b078a600003022e621fec2 Mon Sep 17 00:00:00 2001 From: Gareth Evans Date: Thu, 10 Feb 2022 19:47:57 +0000 Subject: [PATCH 3/3] Remove unused method --- actions/tomee-dependency/main.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/actions/tomee-dependency/main.go b/actions/tomee-dependency/main.go index 106d3ef7..ec8282b8 100644 --- a/actions/tomee-dependency/main.go +++ b/actions/tomee-dependency/main.go @@ -82,12 +82,3 @@ func main() { } o.Write(os.Stdout) } - -func GetLatest(v actions.Versions, inputs actions.Inputs, mods ...actions.RequestModifierFunc) (actions.Outputs, error) { - latestVersion, err := v.GetLatestVersion(inputs) - if err != nil { - return nil, err - } - - return actions.NewOutputs(v[latestVersion.Original()], latestVersion, nil, mods...) -}