From 0bb02c26a6b8844e9da68b3c2e52ef3fb4dc2307 Mon Sep 17 00:00:00 2001 From: anastasiiakozlova245 Date: Tue, 23 Jan 2024 22:13:38 +0100 Subject: [PATCH 1/2] feat: update goreleaser settings --- .github/workflows/release.yml | 2 + .goreleaser.yaml | 120 ----------------------------- .goreleaser.yml | 139 ++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 120 deletions(-) delete mode 100644 .goreleaser.yaml create mode 100644 .goreleaser.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86c552e2..7ca6d3b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,6 +20,8 @@ jobs: fetch-depth: 0 - name: Set up Go uses: actions/setup-go@v5 + with: + go-version: 1.21 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 with: diff --git a/.goreleaser.yaml b/.goreleaser.yaml deleted file mode 100644 index 840b99c0..00000000 --- a/.goreleaser.yaml +++ /dev/null @@ -1,120 +0,0 @@ -# yaml-language-server: $schema=https://goreleaser.com/static/schema.json -# vim: set ts=2 sw=2 tw=0 fo=cnqoj - -project_name: tenv -version: 1 - -before: - hooks: - - go mod tidy - - go test ./... - -builds: - - id: tenv - binary: tenv - main: ./cmd/tenv - - env: - - CGO_ENABLED=0 - - goos: - - linux - - windows - - darwin - - freebsd - - openbsd - - solaris - - goarch: - - "386" - - amd64 - - arm - - arm64 - - - id: tofu - binary: tofu - main: ./cmd/tofu - - env: - - CGO_ENABLED=0 - - goos: - - linux - - windows - - darwin - - freebsd - - openbsd - - solaris - - goarch: - - "386" - - amd64 - - arm - - arm64 - - - id: terraform - binary: terraform - main: ./cmd/terraform - - env: - - CGO_ENABLED=0 - - goos: - - linux - - windows - - darwin - - freebsd - - openbsd - - solaris - - goarch: - - "386" - - amd64 - - arm - - arm64 - -release: - name_template: "Release {{.Tag}}" - -changelog: - use: github-native - -archives: - - format: zip - name_template: "{{ .ProjectName }}_{{ .Version }}_{{- .Os }}_{{- .Arch }}" - -nfpms: - - file_name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Arch }}' - maintainer: 'https://github.com/dvaumoron' - homepage: https://github.com/tofuutils/tenv - description: >- - tenv help manage several version of OpenTofu (https://opentofu.org) and Terraform (https://www.terraform.io/), - tenv is the managing command and tofu and terraform are proxy commands. - license: "Apache-2.0" - formats: - - deb - - rpm - - apk - bindir: /usr/bin - section: default - contents: - - src: ./LICENSE - dst: /usr/share/doc/tenv/copyright - file_info: - mode: 0444 - rpm: - signature: - key_file: "{{ if index .Env \"GPG_KEY_FILE\" }}{{.Env.GPG_KEY_FILE}}{{ end }}" - deb: - signature: - key_file: "{{ if index .Env \"GPG_KEY_FILE\" }}{{.Env.GPG_KEY_FILE}}{{ end }}" - -brews: - - repository: - owner: tofuutils - name: homebrew-tap - folder: Formula - homepage: https://github.com/tofuutils/tenv - description: OpenTofu and Terraform version manager (inspired by tofuenv, written in Go) - license: "Apache-2.0" - commit_msg_template: "Brew formula update for {{ .ProjectName }} version {{ .Tag }}" diff --git a/.goreleaser.yml b/.goreleaser.yml new file mode 100644 index 00000000..aa6ffc79 --- /dev/null +++ b/.goreleaser.yml @@ -0,0 +1,139 @@ +project_name: tenv +version: 1 + +before: + hooks: + # You may remove this if you don't use go modules. + - go get -u ./cmd/tenv + - go get -u ./cmd/tofu + - go get -u ./cmd/terraform + - go mod tidy + +builds: + - id: tenv + main: ./cmd/tenv + binary: tenv + env: + - CGO_ENABLED=0 + + ldflags: + - -s -w + goos: + - linux + - windows + - darwin + - freebsd + - openbsd + - solaris + + goarch: + - "386" + - amd64 + - arm + - arm64 + + ignore: + - goos: darwin + goarch: 386 + - goos: darwin + goarch: arm + - goos: solaris + goarch: 386 + - goos: solaris + goarch: arm + - goos: solaris + goarch: arm64 + + - id: tofu + binary: tofu + main: ./cmd/tofu + env: + - CGO_ENABLED=0 + + goos: + - linux + - windows + - darwin + - freebsd + - openbsd + - solaris + + goarch: + - "386" + - amd64 + - arm + - arm64 + + ignore: + - goos: darwin + goarch: 386 + - goos: darwin + goarch: arm + - goos: solaris + goarch: 386 + - goos: solaris + goarch: arm + - goos: solaris + goarch: arm64 + + - id: terraform + binary: terraform + main: ./cmd/terraform + env: + - CGO_ENABLED=0 + + goos: + - linux + - windows + - darwin + - freebsd + - openbsd + - solaris + + goarch: + - "386" + - amd64 + - arm + - arm64 + + ignore: + - goos: darwin + goarch: 386 + - goos: darwin + goarch: arm + - goos: solaris + goarch: 386 + - goos: solaris + goarch: arm + - goos: solaris + goarch: arm64 + +archives: + - format: tar.gz + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .ProjectName }}_ + {{ .Tag }}_ + {{- 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 + +release: + name_template: "Release {{.Tag}}" + +changelog: + use: github-native + sort: asc + filters: + exclude: + - "^test:" + +checksum: + name_template: "{{ .ProjectName }}_{{ .Tag }}_checksums.txt" + algorithm: sha256 From 37ef1a8a2857959c083c2a7033960f9df839646a Mon Sep 17 00:00:00 2001 From: anastasiiakozlova245 Date: Tue, 23 Jan 2024 22:19:39 +0100 Subject: [PATCH 2/2] chore: remove comments --- .goreleaser.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index aa6ffc79..0366ba55 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -3,7 +3,6 @@ version: 1 before: hooks: - # You may remove this if you don't use go modules. - go get -u ./cmd/tenv - go get -u ./cmd/tofu - go get -u ./cmd/terraform