From 455163fa722d130addd78ef2e2476be0b2be5985 Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:30:59 +1000 Subject: [PATCH 1/9] Configure goreleaser again --- .gitignore | 1 + .goreleaser.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++ .goreleaser.yml | 18 ------------------ 3 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 .goreleaser.yaml delete mode 100644 .goreleaser.yml diff --git a/.gitignore b/.gitignore index affce1a6..bddb9a22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.snap .snapcraft coverage.txt +dist muffet parts prime diff --git a/.goreleaser.yaml b/.goreleaser.yaml new file mode 100644 index 00000000..a65edfee --- /dev/null +++ b/.goreleaser.yaml @@ -0,0 +1,45 @@ +# This is an example .goreleaser.yml file with some sensible defaults. +# Make sure to check the documentation at https://goreleaser.com +before: + hooks: + # You may remove this if you don't use go modules. + - go mod tidy + # you may remove this if you don't need go generate + - go generate ./... +builds: + - env: + - CGO_ENABLED=0 + goos: + - linux + - windows + - darwin + +archives: + - format: tar.gz + # this name template makes the OS and Arch compatible with the results of uname. + name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} + # use zip for windows archives + format_overrides: + - goos: windows + format: zip +checksum: + name_template: 'checksums.txt' +snapshot: + name_template: "{{ incpatch .Version }}-next" +changelog: + sort: asc + filters: + exclude: + - '^docs:' + - '^test:' + +# The lines beneath this are called `modelines`. See `:help modeline` +# Feel free to remove those if you don't want/use them. +# yaml-language-server: $schema=https://goreleaser.com/static/schema.json +# vim: set ts=2 sw=2 tw=0 fo=cnqoj diff --git a/.goreleaser.yml b/.goreleaser.yml deleted file mode 100644 index 140bd8a7..00000000 --- a/.goreleaser.yml +++ /dev/null @@ -1,18 +0,0 @@ -builds: - - env: - - CGO_ENABLED=0 - goarch: - - 386 - - amd64 - - arm - - arm64 - goos: - - darwin - - freebsd - - linux - - windows - goarm: - - 6 - - 7 -changelog: - sort: asc From 04d17e5efcec287f50d8e9af66d2fab75e8b4cee Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:31:22 +1000 Subject: [PATCH 2/9] Fix --- .goreleaser.yaml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a65edfee..c99900c9 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,11 +1,3 @@ -# This is an example .goreleaser.yml file with some sensible defaults. -# Make sure to check the documentation at https://goreleaser.com -before: - hooks: - # You may remove this if you don't use go modules. - - go mod tidy - # you may remove this if you don't need go generate - - go generate ./... builds: - env: - CGO_ENABLED=0 @@ -13,7 +5,6 @@ builds: - linux - windows - darwin - archives: - format: tar.gz # this name template makes the OS and Arch compatible with the results of uname. @@ -26,19 +17,18 @@ archives: {{- if .Arm }}v{{ .Arm }}{{ end }} # use zip for windows archives format_overrides: - - goos: windows - format: zip + - goos: windows + format: zip checksum: - name_template: 'checksums.txt' + name_template: "checksums.txt" snapshot: name_template: "{{ incpatch .Version }}-next" changelog: sort: asc filters: exclude: - - '^docs:' - - '^test:' - + - "^docs:" + - "^test:" # The lines beneath this are called `modelines`. See `:help modeline` # Feel free to remove those if you don't want/use them. # yaml-language-server: $schema=https://goreleaser.com/static/schema.json From e4ecbaadf8c234661409e8a06697e515fcc74c95 Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:31:59 +1000 Subject: [PATCH 3/9] Fix --- .goreleaser.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index c99900c9..2d2bcdbf 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -21,15 +21,5 @@ archives: format: zip checksum: name_template: "checksums.txt" -snapshot: - name_template: "{{ incpatch .Version }}-next" changelog: sort: asc - filters: - exclude: - - "^docs:" - - "^test:" -# The lines beneath this are called `modelines`. See `:help modeline` -# Feel free to remove those if you don't want/use them. -# yaml-language-server: $schema=https://goreleaser.com/static/schema.json -# vim: set ts=2 sw=2 tw=0 fo=cnqoj From 093e728ef96356e2699faef0b18fb46f6a5cdabf Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:33:22 +1000 Subject: [PATCH 4/9] Fix --- .goreleaser.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2d2bcdbf..c30cb53a 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,10 +1,19 @@ builds: - env: - CGO_ENABLED=0 + goarch: + - 386 + - amd64 + - arm + - arm64 goos: + - darwin + - freebsd - linux - windows - - darwin + goarm: + - 6 + - 7 archives: - format: tar.gz # this name template makes the OS and Arch compatible with the results of uname. From 07e61f4050fc92a824aa107d6e54c0e9a4cd352d Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:33:45 +1000 Subject: [PATCH 5/9] Fix --- .goreleaser.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index c30cb53a..46db36d4 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -16,7 +16,6 @@ builds: - 7 archives: - format: tar.gz - # this name template makes the OS and Arch compatible with the results of uname. name_template: >- {{ .ProjectName }}_ {{- title .Os }}_ @@ -24,7 +23,6 @@ archives: {{- else if eq .Arch "386" }}i386 {{- else }}{{ .Arch }}{{ end }} {{- if .Arm }}v{{ .Arm }}{{ end }} - # use zip for windows archives format_overrides: - goos: windows format: zip From 661ea09534764224986760735f6211c3bef50ffb Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:36:09 +1000 Subject: [PATCH 6/9] Fix --- .goreleaser.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 46db36d4..ca99fa84 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -16,13 +16,13 @@ builds: - 7 archives: - format: tar.gz - name_template: >- - {{ .ProjectName }}_ - {{- title .Os }}_ - {{- if eq .Arch "amd64" }}x86_64 - {{- else if eq .Arch "386" }}i386 - {{- else }}{{ .Arch }}{{ end }} - {{- if .Arm }}v{{ .Arm }}{{ end }} + name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" + replacements: + darwin: Darwin + linux: Linux + windows: Windows + 386: i386 + amd64: x86_64 format_overrides: - goos: windows format: zip From e48f922a47f4a7e3e5a736a26097931d62898c32 Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:37:21 +1000 Subject: [PATCH 7/9] Fix --- .goreleaser.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ca99fa84..66895ce8 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -19,6 +19,7 @@ archives: name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" replacements: darwin: Darwin + freebsd: FreeBSD linux: Linux windows: Windows 386: i386 From fc2cc6e2650322d731578fa5c51c489b2cdf6544 Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:37:50 +1000 Subject: [PATCH 8/9] Fix --- .goreleaser.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 66895ce8..f3820b72 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -27,7 +27,5 @@ archives: format_overrides: - goos: windows format: zip -checksum: - name_template: "checksums.txt" changelog: sort: asc From cbe572969a050fb4c3a642c6d2a83200397f2649 Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Thu, 29 Jun 2023 13:38:54 +1000 Subject: [PATCH 9/9] Fix --- .goreleaser.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f3820b72..9ddf9dcd 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -17,13 +17,6 @@ builds: archives: - format: tar.gz name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" - replacements: - darwin: Darwin - freebsd: FreeBSD - linux: Linux - windows: Windows - 386: i386 - amd64: x86_64 format_overrides: - goos: windows format: zip