From 4936929ddd86551a7747c6fe07a7057c60e38ff4 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 6 Jun 2023 00:32:34 -0300 Subject: [PATCH] feat: sort brew dependencies so it better aligns with brew audit Signed-off-by: Carlos Alexandro Becker --- internal/pipe/brew/brew.go | 3 +++ .../pipe/brew/testdata/TestFullPipe/custom_block.rb.golden | 2 +- .../testdata/TestFullPipe/custom_download_strategy.rb.golden | 2 +- .../pipe/brew/testdata/TestFullPipe/custom_require.rb.golden | 2 +- internal/pipe/brew/testdata/TestFullPipe/default.rb.golden | 2 +- .../pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden | 2 +- internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden | 2 +- internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden | 2 +- .../brew/testdata/TestFullPipe/valid_tap_templates.rb.golden | 2 +- .../TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden | 2 +- .../TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden | 2 +- .../TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden | 2 +- 12 files changed, 14 insertions(+), 11 deletions(-) diff --git a/internal/pipe/brew/brew.go b/internal/pipe/brew/brew.go index a30f06f1f55..eff47f4adad 100644 --- a/internal/pipe/brew/brew.go +++ b/internal/pipe/brew/brew.go @@ -347,6 +347,9 @@ func keys(m map[string]bool) []string { } func dataFor(ctx *context.Context, cfg config.Homebrew, cl client.ReleaserURLTemplater, artifacts []*artifact.Artifact) (templateData, error) { + sort.Slice(cfg.Dependencies, func(i, j int) bool { + return cfg.Dependencies[i].Name < cfg.Dependencies[j].Name + }) result := templateData{ Name: formulaNameFor(cfg.Name), Desc: cfg.Description, diff --git a/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden index f1184a21a0d..86fe1f8fec1 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden @@ -7,9 +7,9 @@ class CustomBlock < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/custom_download_strategy.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/custom_download_strategy.rb.golden index 2dd74674612..330a4644720 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/custom_download_strategy.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/custom_download_strategy.rb.golden @@ -7,9 +7,9 @@ class CustomDownloadStrategy < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden index ab512b6427f..a9698cdc856 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden @@ -8,9 +8,9 @@ class CustomRequire < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden index 35e3f9d7be0..43a55b0c5e7 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden @@ -7,9 +7,9 @@ class Default < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden index 76d873757a5..e4e70042cd8 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden @@ -7,9 +7,9 @@ class DefaultGitlab < Formula homepage "https://gitlab.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden index 3937377ac21..7db4e44ff7f 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden @@ -7,9 +7,9 @@ class GitRemote < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden index 95f8e3a9a90..ac45ea74c03 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden @@ -7,9 +7,9 @@ class OpenPr < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestFullPipe/valid_tap_templates.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/valid_tap_templates.rb.golden index a87974ae17a..acdac4c4aad 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/valid_tap_templates.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/valid_tap_templates.rb.golden @@ -7,9 +7,9 @@ class ValidTapTemplates < Formula homepage "" version "1.0.1" - depends_on "zsh" => :optional depends_on "bash" => "3.2.57" depends_on "fish" => :optional + depends_on "zsh" => :optional on_macos do if Hardware::CPU.intel? diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden index 1cd003ca3d0..91e140d6e11 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden @@ -7,8 +7,8 @@ class MultipleArmv5 < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" depends_on "bash" => :recommended + depends_on "zsh" on_macos do url "https://dummyhost/download/v1.0.1/bin.tar.gz" diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden index b60fe0a4b53..70768aa880d 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden @@ -7,8 +7,8 @@ class MultipleArmv6 < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" depends_on "bash" => :recommended + depends_on "zsh" on_macos do url "https://dummyhost/download/v1.0.1/bin.tar.gz" diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden index d9ba71317ee..00b14573bef 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden @@ -7,8 +7,8 @@ class MultipleArmv7 < Formula homepage "https://github.com/goreleaser" version "1.0.1" - depends_on "zsh" depends_on "bash" => :recommended + depends_on "zsh" on_macos do url "https://dummyhost/download/v1.0.1/bin.tar.gz"