Skip to content

Commit afbb166

Browse files
rgee0alexellis
authored andcommitted
maint: enable arm64 for dive
Signed-off-by: Richard Gee <[email protected]>
1 parent eefcf35 commit afbb166

File tree

2 files changed

+35
-29
lines changed

2 files changed

+35
-29
lines changed

pkg/get/get_test.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3595,7 +3595,7 @@ func Test_DownloadTFSecCli(t *testing.T) {
35953595
func Test_DownloadDive(t *testing.T) {
35963596
tools := MakeTools()
35973597
name := "dive"
3598-
version := "0.10.0"
3598+
version := "v0.13.1"
35993599

36003600
tool := getTool(name, tools)
36013601

@@ -3604,31 +3604,37 @@ func Test_DownloadDive(t *testing.T) {
36043604
os: "darwin",
36053605
arch: arch64bit,
36063606
version: version,
3607-
url: `https://github.com/wagoodman/dive/releases/download/v0.10.0/dive_0.10.0_darwin_amd64.tar.gz`,
3607+
url: `https://github.com/wagoodman/dive/releases/download/v0.13.1/dive_0.13.1_darwin_amd64.tar.gz`,
36083608
},
36093609
{
36103610
os: "darwin",
36113611
arch: archARM64,
36123612
version: version,
3613-
url: `https://github.com/wagoodman/dive/releases/download/v0.10.0/dive_0.10.0_darwin_amd64.tar.gz`,
3613+
url: `https://github.com/wagoodman/dive/releases/download/v0.13.1/dive_0.13.1_darwin_arm64.tar.gz`,
36143614
},
36153615
{
36163616
os: "linux",
36173617
arch: arch64bit,
36183618
version: version,
3619-
url: `https://github.com/wagoodman/dive/releases/download/v0.10.0/dive_0.10.0_linux_amd64.tar.gz`,
3619+
url: `https://github.com/wagoodman/dive/releases/download/v0.13.1/dive_0.13.1_linux_amd64.tar.gz`,
36203620
},
36213621
{
36223622
os: "linux",
36233623
arch: archARM64,
36243624
version: version,
3625-
url: `https://github.com/wagoodman/dive/releases/download/v0.10.0/dive_0.10.0_linux_amd64.tar.gz`,
3625+
url: `https://github.com/wagoodman/dive/releases/download/v0.13.1/dive_0.13.1_linux_arm64.tar.gz`,
36263626
},
36273627
{
36283628
os: "ming",
36293629
arch: arch64bit,
36303630
version: version,
3631-
url: `https://github.com/wagoodman/dive/releases/download/v0.10.0/dive_0.10.0_windows_amd64.zip`,
3631+
url: `https://github.com/wagoodman/dive/releases/download/v0.13.1/dive_0.13.1_windows_amd64.zip`,
3632+
},
3633+
{
3634+
os: "ming",
3635+
arch: archARM64,
3636+
version: version,
3637+
url: `https://github.com/wagoodman/dive/releases/download/v0.13.1/dive_0.13.1_windows_arm64.zip`,
36323638
},
36333639
}
36343640

@@ -3639,7 +3645,7 @@ func Test_DownloadDive(t *testing.T) {
36393645
t.Fatal(err)
36403646
}
36413647
if got != tc.url {
3642-
t.Errorf("want: %s, got: %s", tc.url, got)
3648+
t.Errorf("\nwant: %s\ngot: %s", tc.url, got)
36433649
}
36443650
})
36453651
}
@@ -8713,7 +8719,7 @@ func Test_DownloadOpencode(t *testing.T) {
87138719
t.Fatal(err)
87148720
}
87158721
if got != tc.url {
8716-
t.Errorf("want: %s, got: %s", tc.url, got)
8722+
t.Errorf("\nwant: %s\ngot: %s", tc.url, got)
87178723
}
87188724
}
87198725
}

pkg/get/tools.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,28 +2195,28 @@ https://github.com/{{.Owner}}/{{.Repo}}/releases/download/{{.Version}}/{{.Name}}
21952195

21962196
tools = append(tools,
21972197
Tool{
2198-
Owner: "wagoodman",
2199-
Repo: "dive",
2200-
Name: "dive",
2201-
Version: "0.10.0",
2202-
Description: "A tool for exploring each layer in a docker image",
2203-
URLTemplate: `{{$osStr := ""}}
2204-
{{- if HasPrefix .OS "ming" -}}
2205-
{{$osStr = "windows"}}
2206-
{{- else if eq .OS "linux" -}}
2207-
{{$osStr = "linux"}}
2208-
{{- else if eq .OS "darwin" -}}
2209-
{{$osStr = "darwin"}}
2210-
{{- end -}}
2211-
2212-
{{$archiveStr := ""}}
2213-
{{- if HasPrefix .OS "ming" -}}
2214-
{{$archiveStr = ".zip"}}
2215-
{{- else -}}
2216-
{{$archiveStr = ".tar.gz"}}
2217-
{{- end -}}
2198+
Owner: "wagoodman",
2199+
Repo: "dive",
2200+
Name: "dive",
2201+
VersionStrategy: GitHubVersionStrategy,
2202+
Description: "A tool for exploring each layer in a docker image",
2203+
BinaryTemplate: `
2204+
{{$os := .OS}}
2205+
{{$arch := .Arch}}
2206+
{{$ext := ".tar.gz"}}
2207+
2208+
{{- if HasPrefix .OS "ming" -}}
2209+
{{$os = "windows"}}
2210+
{{$ext = ".zip"}}
2211+
{{- end -}}
2212+
2213+
{{- if eq .Arch "x86_64" -}}
2214+
{{$arch = "amd64"}}
2215+
{{- else if (or (eq .Arch "aarch64") (eq .Arch "arm64")) -}}
2216+
{{$arch = "arm64"}}
2217+
{{- end -}}
22182218
2219-
https://github.com/{{.Owner}}/{{.Name}}/releases/download/v{{.Version}}/{{.Name}}_{{.Version}}_{{$osStr}}_amd64{{$archiveStr}}`,
2219+
{{.Name}}_{{.VersionNumber}}_{{$os}}_{{$arch}}{{$ext}}`,
22202220
},
22212221
)
22222222

0 commit comments

Comments
 (0)