feat: sort brew dependencies

so it better aligns with brew audit Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
goreleaser · Jun 6, 2023 · 4936929 · 4936929
1 parent 1c9b4d5
commit 4936929
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"