From 7e72f444bbd0ca0a1eb428fa4908f1df8e47127c Mon Sep 17 00:00:00 2001 From: amitz Date: Thu, 4 Apr 2024 00:55:00 +0300 Subject: [PATCH 01/11] update --- .goreleaser.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ec42c2f749..4fd76d14ff 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -64,6 +64,12 @@ builds: goarch: ppc64le - goos: windows goarch: arm64 + ldflags: + - -X github.com/cosmos/cosmos-sdk/version.Name=lava + - -X github.com/cosmos/cosmos-sdk/version.AppName=lavad + - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} + - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} + - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger flags: - -mod=readonly - -trimpath From ff98a2f475827ffad46ad2d94f678b8a7d79482a Mon Sep 17 00:00:00 2001 From: amitz Date: Thu, 4 Apr 2024 01:20:56 +0300 Subject: [PATCH 02/11] seperate archives --- .goreleaser.yaml | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 4fd76d14ff..6ca7b68481 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -102,10 +102,45 @@ builds: - -trimpath archives: - - format: tar.gz + - id: lavavisor + builds: + - lavavisor + format: tar.gz + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .Binary }}_ + {{- 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 + - id: lavap + builds: + - lavap + format: tar.gz + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .Binary }}_ + {{- 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 + - id: lavad + builds: + - lavad + format: tar.gz # this name template makes the OS and Arch compatible with the results of `uname`. name_template: >- - {{ .ProjectName }}_ + {{ .Binary }}_ {{- title .Os }}_ {{- if eq .Arch "amd64" }}x86_64 {{- else if eq .Arch "386" }}i386 From 5f6527d1e1ecc1287f07da645087b02b0979f73a Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 11:21:13 +0300 Subject: [PATCH 03/11] fix --- .goreleaser.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 6ca7b68481..ca2a73b001 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -70,9 +70,13 @@ builds: - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger + - -w -s flags: - -mod=readonly - -trimpath + tags: + - netgo + - ledger - id: lavap binary: lavap From 81315dd553ff8e37584830ab95ba1a11b11d09d7 Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 11:31:17 +0300 Subject: [PATCH 04/11] binary format --- .goreleaser.yaml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ca2a73b001..36a0b4a127 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -109,15 +109,7 @@ archives: - id: lavavisor builds: - lavavisor - format: tar.gz - # this name template makes the OS and Arch compatible with the results of `uname`. - name_template: >- - {{ .Binary }}_ - {{- title .Os }}_ - {{- if eq .Arch "amd64" }}x86_64 - {{- else if eq .Arch "386" }}i386 - {{- else }}{{ .Arch }}{{ end }} - {{- if .Arm }}v{{ .Arm }}{{ end }} + format: binary # use zip for windows archives format_overrides: - goos: windows @@ -125,15 +117,7 @@ archives: - id: lavap builds: - lavap - format: tar.gz - # this name template makes the OS and Arch compatible with the results of `uname`. - name_template: >- - {{ .Binary }}_ - {{- title .Os }}_ - {{- if eq .Arch "amd64" }}x86_64 - {{- else if eq .Arch "386" }}i386 - {{- else }}{{ .Arch }}{{ end }} - {{- if .Arm }}v{{ .Arm }}{{ end }} + format: binary # use zip for windows archives format_overrides: - goos: windows @@ -141,15 +125,7 @@ archives: - id: lavad builds: - lavad - format: tar.gz - # this name template makes the OS and Arch compatible with the results of `uname`. - name_template: >- - {{ .Binary }}_ - {{- title .Os }}_ - {{- if eq .Arch "amd64" }}x86_64 - {{- else if eq .Arch "386" }}i386 - {{- else }}{{ .Arch }}{{ end }} - {{- if .Arm }}v{{ .Arm }}{{ end }} + format: binary # use zip for windows archives format_overrides: - goos: windows From fa195eab7a61a48679ea04eabfa2e004a031b9bc Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 12:18:52 +0300 Subject: [PATCH 05/11] sha256sum --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 36a0b4a127..6fb219b59b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -132,7 +132,7 @@ archives: format: zip checksum: - name_template: '{{ .ProjectName }}_{{ .Version }}_checksums.txt' + name_template: "sha256sum.txt" algorithm: sha256 changelog: From 2df3898d18fc108975b2aaf292cd87ded858a745 Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 12:26:25 +0300 Subject: [PATCH 06/11] header --- .goreleaser.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 6fb219b59b..8ec12e8e23 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -169,3 +169,6 @@ release: name_template: "Lava v{{.Version}} 🌋" mode: replace draft: true + header: + from_file: + path: "dist/CHANGELOG.md" From ae24e7a353e65d864987ae4469b129bf0dff0c15 Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 12:31:57 +0300 Subject: [PATCH 07/11] changelog --- .goreleaser.yaml | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 8ec12e8e23..90c962057c 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -140,26 +140,37 @@ changelog: github sort: asc abbrev: 0 - groups: # Regex use RE2 syntax as defined here: https://github.com/google/re2/wiki/Syntax. - - title: 'Features' - regexp: '^.*?feat(\([[:word:]]+\))??!?:.+$' + groups: + - title: Dependency updates + regexp: '^.*?(feat|fix|chore)\(deps\)!?:.+$' + order: 300 + - title: "New Features" + regexp: '^.*?feat(\(.+\))??!?:.+$' order: 100 - - title: 'Bug fixes' - regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$' + - title: "Security updates" + regexp: '^.*?sec(\(.+\))??!?:.+$' + order: 150 + - title: "Bug fixes" + regexp: '^.*?(fix|refactor)(\(.+\))??!?:.+$' order: 200 - - title: 'Documentation' - regexp: '^.*?docs(\([[:word:]]+\))??!?:.+$' - order: 300 - - title: 'Dependency updates' - regexp: '^.*?(feat|fix|chore)\(deps?.+\)!?:.+$' + - title: "Documentation updates" + regexp: ^.*?docs?(\(.+\))??!?:.+$ + order: 400 + - title: "Build process updates" + regexp: ^.*?(build|ci)(\(.+\))??!?:.+$ order: 400 - - title: 'Other work' - order: 999 + - title: Other work + order: 9999 filters: exclude: - - '^test:' - - '^.*?Bump(\([[:word:]]+\))?.+$' - - '^.*?[Bot](\([[:word:]]+\))?.+$' + - "^test:" + - "^test\\(" + - "^chore" + - "merge conflict" + - Merge pull request + - Merge remote-tracking branch + - Merge branch + - go mod tidy release: github: @@ -169,6 +180,3 @@ release: name_template: "Lava v{{.Version}} 🌋" mode: replace draft: true - header: - from_file: - path: "dist/CHANGELOG.md" From ba3986315b0e567ad21081ee9cecf0189f45d125 Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 12:32:50 +0300 Subject: [PATCH 08/11] 0 --- .goreleaser.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 90c962057c..4a56e0a24f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -139,7 +139,6 @@ changelog: use: github sort: asc - abbrev: 0 groups: - title: Dependency updates regexp: '^.*?(feat|fix|chore)\(deps\)!?:.+$' From 50b3685b7247f74d18be3dd2e43240e926c1348b Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 12:36:48 +0300 Subject: [PATCH 09/11] metadata --- .goreleaser.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 4a56e0a24f..8c90320dbe 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -13,6 +13,9 @@ before: # you may remove this if you don't need go generate - go generate ./... +metadata: + mod_timestamp: "{{ .CommitTimestamp }}" + builds: - id: lavavisor binary: lavavisor @@ -40,6 +43,7 @@ builds: flags: - -mod=readonly - -trimpath + mod_timestamp: "{{ .CommitTimestamp }}" - id: lavad binary: lavad @@ -77,6 +81,7 @@ builds: tags: - netgo - ledger + mod_timestamp: "{{ .CommitTimestamp }}" - id: lavap binary: lavap @@ -104,6 +109,7 @@ builds: flags: - -mod=readonly - -trimpath + mod_timestamp: "{{ .CommitTimestamp }}" archives: - id: lavavisor From eceaef5d951e94917a954e6a4788a58e177fbd74 Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 18:01:11 +0300 Subject: [PATCH 10/11] update name template --- .goreleaser.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 8c90320dbe..60ff9e38a8 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -116,7 +116,7 @@ archives: builds: - lavavisor format: binary - # use zip for windows archives + name_template: '{{ .Binary }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' format_overrides: - goos: windows format: zip @@ -124,7 +124,7 @@ archives: builds: - lavap format: binary - # use zip for windows archives + name_template: '{{ .Binary }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' format_overrides: - goos: windows format: zip @@ -132,7 +132,7 @@ archives: builds: - lavad format: binary - # use zip for windows archives + name_template: '{{ .Binary }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' format_overrides: - goos: windows format: zip From ecdc2598787eea0a8179a55f9bb9c1513817de83 Mon Sep 17 00:00:00 2001 From: Amit Zafran Date: Thu, 4 Apr 2024 19:22:31 +0300 Subject: [PATCH 11/11] - --- .goreleaser.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 60ff9e38a8..e56314c492 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -116,7 +116,7 @@ archives: builds: - lavavisor format: binary - name_template: '{{ .Binary }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' + name_template: '{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}-{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' format_overrides: - goos: windows format: zip @@ -124,7 +124,7 @@ archives: builds: - lavap format: binary - name_template: '{{ .Binary }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' + name_template: '{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}-{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' format_overrides: - goos: windows format: zip @@ -132,7 +132,7 @@ archives: builds: - lavad format: binary - name_template: '{{ .Binary }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' + name_template: '{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}-{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}' format_overrides: - goos: windows format: zip