From 14ab45930090e4da037591901a12471de9f08db7 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sun, 5 May 2024 23:04:22 -0300 Subject: [PATCH] fix(brew): linux brew with extra end refs #4822 Signed-off-by: Carlos Alexandro Becker --- .../pipe/brew/templates/linux_packages.rb | 36 +++++++++---------- .../brew/testdata/TestFullFormulae.rb.golden | 34 +++++++++--------- .../TestFullFormulaeLinuxOnly.rb.golden | 32 ++++++++--------- .../TestFullPipe/custom_block.rb.golden | 10 +++--- .../custom_download_strategy.rb.golden | 10 +++--- .../TestFullPipe/custom_require.rb.golden | 10 +++--- .../testdata/TestFullPipe/default.rb.golden | 10 +++--- .../TestFullPipe/default_gitlab.rb.golden | 10 +++--- .../TestFullPipe/git_remote.rb.golden | 10 +++--- .../testdata/TestFullPipe/open_pr.rb.golden | 10 +++--- .../valid_repository_templates.rb.golden | 10 +++--- .../TestFullPipe/with_header.rb.golden | 14 ++++---- .../TestFullPipe/with_many_headers.rb.golden | 14 ++++---- .../v1.rb.golden | 27 +++++++------- .../v2.rb.golden | 27 +++++++------- .../v3.rb.golden | 27 +++++++------- .../v4.rb.golden | 27 +++++++------- .../multiple_armv5.rb.golden | 22 ++++++------ .../multiple_armv6.rb.golden | 22 ++++++------ .../multiple_armv7.rb.golden | 22 ++++++------ 20 files changed, 185 insertions(+), 199 deletions(-) diff --git a/internal/pipe/brew/templates/linux_packages.rb b/internal/pipe/brew/templates/linux_packages.rb index c12b1e6518a..d9c048fb015 100644 --- a/internal/pipe/brew/templates/linux_packages.rb +++ b/internal/pipe/brew/templates/linux_packages.rb @@ -2,29 +2,29 @@ {{- range $element := .LinuxPackages }} {{- if eq $element.Arch "amd64" }} on_intel do + if Hardware::CPU.is_64_bit? {{- end }} - {{- if eq $element.Arch "arm" }} + {{- if or (eq $element.Arch "arm") (eq $element.Arch "arm64") }} on_arm do + {{- if eq $element.Arch "arm64" }} + if Hardware::CPU.is_64_bit? + {{- else }} if !Hardware::CPU.is_64_bit? - {{- end }} - {{- if eq $element.Arch "arm64" }} - on_arm do - if Hardware::CPU.is_64_bit? + {{- end }} + {{- end }} + url "{{ $element.DownloadURL }}" + {{- if .DownloadStrategy }}, using: {{ .DownloadStrategy }}{{- end }} + {{- if .Headers }}, + headers: [{{ printf "\n" }} + {{- join .Headers | indent 10 }} + ] {{- end }} - url "{{ $element.DownloadURL }}" - {{- if .DownloadStrategy }}, using: {{ .DownloadStrategy }}{{- end }} - {{- if .Headers }}, - headers: [{{ printf "\n" }} - {{- join .Headers | indent 10 }} - ] - {{- end }} - sha256 "{{ $element.SHA256 }}" + sha256 "{{ $element.SHA256 }}" - def install - {{- range $index, $element := .Install }} - {{ . -}} - {{- end }} - end + def install + {{- range $index, $element := .Install }} + {{ . -}} + {{- end }} end end end diff --git a/internal/pipe/brew/testdata/TestFullFormulae.rb.golden b/internal/pipe/brew/testdata/TestFullFormulae.rb.golden index 5b92e2975e9..45116289aab 100644 --- a/internal/pipe/brew/testdata/TestFullFormulae.rb.golden +++ b/internal/pipe/brew/testdata/TestFullFormulae.rb.golden @@ -31,34 +31,32 @@ class Test < Formula on_linux do on_intel do - url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Linux_x86_64.tar.gz" - sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" + if Hardware::CPU.is_64_bit? + url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Linux_x86_64.tar.gz" + sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" - def install - bin.install "test" - end + def install + bin.install "test" end end end on_arm do if !Hardware::CPU.is_64_bit? - url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm6.tar.gz" - sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" + url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm6.tar.gz" + sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" - def install - bin.install "test" - end + def install + bin.install "test" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm64.tar.gz" - sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" - - def install - bin.install "test" - end + on_arm do + if Hardware::CPU.is_64_bit? + url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm64.tar.gz" + sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" + + def install + bin.install "test" end end end diff --git a/internal/pipe/brew/testdata/TestFullFormulaeLinuxOnly.rb.golden b/internal/pipe/brew/testdata/TestFullFormulaeLinuxOnly.rb.golden index 5fdfb7f3b08..8263852b27f 100644 --- a/internal/pipe/brew/testdata/TestFullFormulaeLinuxOnly.rb.golden +++ b/internal/pipe/brew/testdata/TestFullFormulaeLinuxOnly.rb.golden @@ -9,34 +9,32 @@ class Test < Formula depends_on :linux on_intel do - url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Linux_x86_64.tar.gz" - sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" + if Hardware::CPU.is_64_bit? + url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Linux_x86_64.tar.gz" + sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" - def install - bin.install "test" - end + def install + bin.install "test" end end end on_arm do if !Hardware::CPU.is_64_bit? - url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm6.tar.gz" - sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" + url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm6.tar.gz" + sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" - def install - bin.install "test" - end + def install + bin.install "test" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm64.tar.gz" - sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_Arm64.tar.gz" + sha256 "1633f61598ab0791e213135923624eb342196b3494909c91899bcd0560f84c67" - def install - bin.install "test" - end + def install + bin.install "test" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden index 6337f36637a..6e4b91bad2d 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/custom_block.rb.golden @@ -34,12 +34,12 @@ class CustomBlock < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "custom_block_linux_amd64 => custom_block" - end + def install + bin.install "custom_block_linux_amd64 => custom_block" end end end 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 eea247aa1af..1a4073d2f53 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/custom_download_strategy.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/custom_download_strategy.rb.golden @@ -34,12 +34,12 @@ class CustomDownloadStrategy < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz", using: GitHubPrivateRepositoryReleaseDownloadStrategy - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz", using: GitHubPrivateRepositoryReleaseDownloadStrategy + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "custom_download_strategy_linux_amd64 => custom_download_strategy" - end + def install + bin.install "custom_download_strategy_linux_amd64 => custom_download_strategy" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden index e92883ac648..9eb63f2c614 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/custom_require.rb.golden @@ -35,12 +35,12 @@ class CustomRequire < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz", using: CustomDownloadStrategy - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz", using: CustomDownloadStrategy + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "custom_require_linux_amd64 => custom_require" - end + def install + bin.install "custom_require_linux_amd64 => custom_require" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden index e91db8b2eda..58f80f65dc9 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/default.rb.golden @@ -34,12 +34,12 @@ class Default < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "default_linux_amd64 => default" - end + def install + bin.install "default_linux_amd64 => default" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden index 4a1be0a0073..a48ea2f42b7 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/default_gitlab.rb.golden @@ -34,12 +34,12 @@ class DefaultGitlab < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "default_gitlab_linux_amd64 => default_gitlab" - end + def install + bin.install "default_gitlab_linux_amd64 => default_gitlab" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden index 920985c6aac..18c4ba984ef 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/git_remote.rb.golden @@ -34,12 +34,12 @@ class GitRemote < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "git_remote_linux_amd64 => git_remote" - end + def install + bin.install "git_remote_linux_amd64 => git_remote" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden index fc608ed07db..082efddf8ce 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/open_pr.rb.golden @@ -34,12 +34,12 @@ class OpenPr < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "open_pr_linux_amd64 => open_pr" - end + def install + bin.install "open_pr_linux_amd64 => open_pr" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/valid_repository_templates.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/valid_repository_templates.rb.golden index 6fd2b514387..773a4cf569c 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/valid_repository_templates.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/valid_repository_templates.rb.golden @@ -34,12 +34,12 @@ class ValidRepositoryTemplates < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "valid_repository_templates_linux_amd64 => valid_repository_templates" - end + def install + bin.install "valid_repository_templates_linux_amd64 => valid_repository_templates" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/with_header.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/with_header.rb.golden index 02b14c59bf1..65a45460a1f 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/with_header.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/with_header.rb.golden @@ -40,15 +40,15 @@ class WithHeader < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz", - headers: [ + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz", + headers: [ "Authorization: bearer #{ENV["HOMEBREW_GITHUB_API_TOKEN"]}" - ] - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + ] + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "with_header_linux_amd64 => with_header" - end + def install + bin.install "with_header_linux_amd64 => with_header" end end end diff --git a/internal/pipe/brew/testdata/TestFullPipe/with_many_headers.rb.golden b/internal/pipe/brew/testdata/TestFullPipe/with_many_headers.rb.golden index c7a12493151..90e2e3dd8de 100644 --- a/internal/pipe/brew/testdata/TestFullPipe/with_many_headers.rb.golden +++ b/internal/pipe/brew/testdata/TestFullPipe/with_many_headers.rb.golden @@ -42,16 +42,16 @@ class WithManyHeaders < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/bin.tar.gz", - headers: [ + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/bin.tar.gz", + headers: [ "Accept: application/octet-stream", "Authorization: bearer #{ENV["HOMEBREW_GITHUB_API_TOKEN"]}" - ] - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + ] + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "with_many_headers_linux_amd64 => with_many_headers" - end + def install + bin.install "with_many_headers_linux_amd64 => with_many_headers" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v1.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v1.rb.golden index 01e9a9381bb..18221abccba 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v1.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v1.rb.golden @@ -21,25 +21,24 @@ class V1 < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/amd64v2.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/amd64v2.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v2.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v2.rb.golden index e9e57258d5d..8595fb3db68 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v2.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v2.rb.golden @@ -21,25 +21,24 @@ class V2 < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/amd64v2.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/amd64v2.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v3.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v3.rb.golden index aa13be55691..eceaa7e16da 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v3.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v3.rb.golden @@ -21,25 +21,24 @@ class V3 < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/amd64v3.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/amd64v3.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v4.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v4.rb.golden index 9369b30fa89..aef973e0d35 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v4.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleAmd64Versions/v4.rb.golden @@ -21,25 +21,24 @@ class V4 < Formula on_linux do on_intel do - url "https://dummyhost/download/v1.0.1/amd64v3.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/amd64v3.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "foo" - man1.install "./man/foo.1.gz" - end + def install + bin.install "foo" + man1.install "./man/foo.1.gz" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden index 03a0ccea792..6cbfa683628 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv5.rb.golden @@ -32,23 +32,21 @@ class MultipleArmv5 < Formula on_linux do on_arm do if !Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/armv5.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + url "https://dummyhost/download/v1.0.1/armv5.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "multiple_armv5" - end + def install + bin.install "multiple_armv5" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "multiple_armv5" - end + def install + bin.install "multiple_armv5" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden index 7ccb16d97c1..df7573387c5 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv6.rb.golden @@ -32,23 +32,21 @@ class MultipleArmv6 < Formula on_linux do on_arm do if !Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/armv6.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + url "https://dummyhost/download/v1.0.1/armv6.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "multiple_armv6" - end + def install + bin.install "multiple_armv6" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "multiple_armv6" - end + def install + bin.install "multiple_armv6" end end end diff --git a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden index 88e4393a9fe..f0353aac1c7 100644 --- a/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden +++ b/internal/pipe/brew/testdata/TestRunPipeForMultipleArmVersions/multiple_armv7.rb.golden @@ -32,23 +32,21 @@ class MultipleArmv7 < Formula on_linux do on_arm do if !Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/armv7.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + url "https://dummyhost/download/v1.0.1/armv7.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "multiple_armv7" - end + def install + bin.install "multiple_armv7" end end end - on_arm do - if Hardware::CPU.is_64_bit? - url "https://dummyhost/download/v1.0.1/arm64.tar.gz" - sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + on_arm do + if Hardware::CPU.is_64_bit? + url "https://dummyhost/download/v1.0.1/arm64.tar.gz" + sha256 "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - def install - bin.install "multiple_armv7" - end + def install + bin.install "multiple_armv7" end end end