From b111e7bd12b53deaa1cf712ffa86c6e5c29597f8 Mon Sep 17 00:00:00 2001 From: Tobias Salzmann <796084+Eun@users.noreply.github.com> Date: Thu, 13 Oct 2022 11:45:44 +0200 Subject: [PATCH 1/2] add armv5 & armv7 builds --- .goreleaser.yml | 6 ++++-- docs/static/install.sh | 6 ++++++ install-task.sh | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 60a03fc0..f6391fc1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -11,7 +11,9 @@ build: - arm - arm64 goarm: + - 5 - 6 + - 7 ignore: - goos: darwin goarch: 386 @@ -27,7 +29,7 @@ gomod: proxy: true archives: - - name_template: "{{.Binary}}_{{.Os}}_{{.Arch}}" + - name_template: "{{.Binary}}_{{.Os}}_{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}" files: - README.md - LICENSE @@ -56,7 +58,7 @@ nfpms: formats: - deb - rpm - file_name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}" + file_name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}" contents: - src: completion/bash/task.bash dst: /etc/bash_completion.d/task diff --git a/docs/static/install.sh b/docs/static/install.sh index 5b488b0e..c1842de6 100755 --- a/docs/static/install.sh +++ b/docs/static/install.sh @@ -64,15 +64,21 @@ get_binaries() { case "$PLATFORM" in darwin/amd64) BINARIES="task" ;; darwin/arm64) BINARIES="task" ;; + darwin/armv5) BINARIES="task" ;; darwin/armv6) BINARIES="task" ;; + darwin/armv7) BINARIES="task" ;; linux/386) BINARIES="task" ;; linux/amd64) BINARIES="task" ;; linux/arm64) BINARIES="task" ;; + linux/armv5) BINARIES="task" ;; linux/armv6) BINARIES="task" ;; + linux/armv7) BINARIES="task" ;; windows/386) BINARIES="task" ;; windows/amd64) BINARIES="task" ;; windows/arm64) BINARIES="task" ;; + windows/armv5) BINARIES="task" ;; windows/armv6) BINARIES="task" ;; + windows/armv7) BINARIES="task" ;; *) log_crit "platform $PLATFORM is not supported. Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new" exit 1 diff --git a/install-task.sh b/install-task.sh index 5b488b0e..c1842de6 100755 --- a/install-task.sh +++ b/install-task.sh @@ -64,15 +64,21 @@ get_binaries() { case "$PLATFORM" in darwin/amd64) BINARIES="task" ;; darwin/arm64) BINARIES="task" ;; + darwin/armv5) BINARIES="task" ;; darwin/armv6) BINARIES="task" ;; + darwin/armv7) BINARIES="task" ;; linux/386) BINARIES="task" ;; linux/amd64) BINARIES="task" ;; linux/arm64) BINARIES="task" ;; + linux/armv5) BINARIES="task" ;; linux/armv6) BINARIES="task" ;; + linux/armv7) BINARIES="task" ;; windows/386) BINARIES="task" ;; windows/amd64) BINARIES="task" ;; windows/arm64) BINARIES="task" ;; + windows/armv5) BINARIES="task" ;; windows/armv6) BINARIES="task" ;; + windows/armv7) BINARIES="task" ;; *) log_crit "platform $PLATFORM is not supported. Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new" exit 1 From 99ed3001f0813149c285714574ce24686a30478f Mon Sep 17 00:00:00 2001 From: Tobias Salzmann <796084+Eun@users.noreply.github.com> Date: Mon, 17 Oct 2022 09:25:26 +0200 Subject: [PATCH 2/2] revert changes, add fix for arm downloads --- .goreleaser.yml | 6 ++---- docs/static/install.sh | 10 ++++------ install-task.sh | 10 ++++------ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index f6391fc1..60a03fc0 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -11,9 +11,7 @@ build: - arm - arm64 goarm: - - 5 - 6 - - 7 ignore: - goos: darwin goarch: 386 @@ -29,7 +27,7 @@ gomod: proxy: true archives: - - name_template: "{{.Binary}}_{{.Os}}_{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}" + - name_template: "{{.Binary}}_{{.Os}}_{{.Arch}}" files: - README.md - LICENSE @@ -58,7 +56,7 @@ nfpms: formats: - deb - rpm - file_name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}" + file_name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}" contents: - src: completion/bash/task.bash dst: /etc/bash_completion.d/task diff --git a/docs/static/install.sh b/docs/static/install.sh index c1842de6..46df0cd6 100755 --- a/docs/static/install.sh +++ b/docs/static/install.sh @@ -190,9 +190,9 @@ uname_arch() { i686) arch="386" ;; i386) arch="386" ;; aarch64) arch="arm64" ;; - armv5*) arch="armv5" ;; - armv6*) arch="armv6" ;; - armv7*) arch="armv7" ;; + armv5*) arch="arm" ;; + armv6*) arch="arm" ;; + armv7*) arch="arm" ;; esac echo ${arch} } @@ -220,9 +220,7 @@ uname_arch_check() { 386) return 0 ;; amd64) return 0 ;; arm64) return 0 ;; - armv5) return 0 ;; - armv6) return 0 ;; - armv7) return 0 ;; + arm) return 0 ;; ppc64) return 0 ;; ppc64le) return 0 ;; mips) return 0 ;; diff --git a/install-task.sh b/install-task.sh index c1842de6..46df0cd6 100755 --- a/install-task.sh +++ b/install-task.sh @@ -190,9 +190,9 @@ uname_arch() { i686) arch="386" ;; i386) arch="386" ;; aarch64) arch="arm64" ;; - armv5*) arch="armv5" ;; - armv6*) arch="armv6" ;; - armv7*) arch="armv7" ;; + armv5*) arch="arm" ;; + armv6*) arch="arm" ;; + armv7*) arch="arm" ;; esac echo ${arch} } @@ -220,9 +220,7 @@ uname_arch_check() { 386) return 0 ;; amd64) return 0 ;; arm64) return 0 ;; - armv5) return 0 ;; - armv6) return 0 ;; - armv7) return 0 ;; + arm) return 0 ;; ppc64) return 0 ;; ppc64le) return 0 ;; mips) return 0 ;;