Skip to content

Commit

Permalink
Update dependencies (#1295)
Browse files Browse the repository at this point in the history
* update go to 1.22.0

* update goreleaser/goreleaser to v5

* Update goreleaser to latest

* update linter

* update go-git
  • Loading branch information
vcheung-stripe authored Jan 22, 2025
1 parent a8b464c commit 059befe
Show file tree
Hide file tree
Showing 10 changed files with 147 additions and 143 deletions.
27 changes: 15 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22.0
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
with:
version: v0.184.0
args: release -f .goreleaser/mac.yml --rm-dist
distribution: goreleaser
version: "~> v2"
args: release -f .goreleaser/mac.yml --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GORELEASER_GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
Expand Down Expand Up @@ -52,12 +53,13 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22.0
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
with:
version: v0.184.0
args: release -f .goreleaser/linux.yml --rm-dist
distribution: goreleaser
version: "~> v2"
args: release -f .goreleaser/linux.yml --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ARTIFACTORY_SECRET: ${{ secrets.ARTIFACTORY_SECRET }}
Expand All @@ -72,12 +74,13 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22.0
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
uses: goreleaser/goreleaser-action@v6
with:
version: v0.184.0
args: release -f .goreleaser/windows.yml --rm-dist
distribution: goreleaser
version: "~> v2"
args: release -f .goreleaser/windows.yml --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GORELEASER_GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22.0
- name: Run GoReleaser Snapshot
uses: goreleaser/goreleaser-action@v2
uses: goreleaser/goreleaser-action@v6
with:
version: v0.184.0
args: release -f .goreleaser/linux.yml --rm-dist --snapshot
distribution: goreleaser
version: "~> v2"
args: release -f .goreleaser/linux.yml --clean --snapshot
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ARTIFACTORY_SECRET: ${{ secrets.ARTIFACTORY_SECRET }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.19.x]
go-version: [1.22.0]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.48
version: v1.63.4
- name: Run Tests
run: make ci
shell: bash
19 changes: 16 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ linters:
disable-all: true
enable:
- bodyclose
- deadcode
- depguard
- dogsled
- dupl
Expand All @@ -20,21 +19,35 @@ linters:
- ineffassign
- misspell
- nakedret
- revive
# - revive -- TODO: reenable after fixing errors
# - rowserrcheck -- disabled because of https://github.com/golangci/golangci-lint/issues/2649
- staticcheck
# - structcheck -- disabled because of https://github.com/golangci/golangci-lint/issues/2649
- typecheck
- unconvert
- unused
- varcheck
- whitespace

linters-settings:
depguard:
rules:
main:
list-mode: lax
allow:
- $all
deny: []
goimports:
local-prefixes: github.com/stripe/stripe-cli
govet:
disable:
- printf
misspell:
locale: US
staticcheck:
checks:
- all
- -SA1006
- -SA1019

issues:
exclude-rules:
Expand Down
12 changes: 7 additions & 5 deletions .goreleaser/linux.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
env:
- GO111MODULE=on
before:
Expand Down Expand Up @@ -29,10 +30,11 @@ builds:
goarch:
- arm64
archives:
- replacements:
linux: linux
386: i386
amd64: x86_64
- name_template: >-
{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_
{{- if eq .Arch "386" }}i386
{{- else if eq .Arch "amd64" }}x86_64
{{- else }}{{ .Arch }}{{ end }}
files:
- none*
changelog:
Expand All @@ -44,7 +46,7 @@ changelog:
checksum:
name_template: "{{ .ProjectName }}-linux-checksums.txt"
snapshot:
name_template: "{{ .Tag }}-next"
version_template: "{{ .Version }}-next"
nfpms:
- id: deb
package_name: stripe
Expand Down
14 changes: 9 additions & 5 deletions .goreleaser/mac.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
env:
- GO111MODULE=on
before:
Expand Down Expand Up @@ -29,9 +30,12 @@ builds:
goarch:
- arm64
archives:
- replacements:
darwin: mac-os
amd64: x86_64
- name_template: >-
{{ .ProjectName }}_{{ .Version }}_
{{- if eq .Os "darwin"}}mac-os
{{- else }}{{ .Os }}{{end}}_
{{- if eq .Arch "amd64" }}x86_64
{{- else }}{{ .Arch }}{{ end }}
files:
- none*
changelog:
Expand All @@ -43,9 +47,9 @@ changelog:
checksum:
name_template: "{{ .ProjectName }}-mac-checksums.txt"
snapshot:
name_template: "{{ .Tag }}-next"
version_template: "{{ .Version }}-next"
brews:
- tap:
- repository:
owner: stripe
name: homebrew-stripe-cli
token: "{{ .Env.GORELEASER_GITHUB_TOKEN }}" # This token can access the repo, but GITHUB_TOKEN cannot
Expand Down
36 changes: 19 additions & 17 deletions .goreleaser/windows.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
env:
- GO111MODULE=on
before:
Expand All @@ -21,13 +22,14 @@ builds:
- amd64
- 386
archives:
- replacements:
windows: windows
386: i386
amd64: x86_64
- name_template: >-
{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_
{{- if eq .Arch "386" }}i386
{{- else if eq .Arch "amd64" }}x86_64
{{- else }}{{ .Arch }}{{ end }}
format_overrides:
- goos: windows
format: zip
formats: zip
files:
- none*
changelog:
Expand All @@ -39,15 +41,15 @@ changelog:
checksum:
name_template: "{{ .ProjectName }}-windows-checksums.txt"
snapshot:
name_template: "{{ .Tag }}-next"
scoop:
bucket:
owner: stripe
name: scoop-stripe-cli
token: "{{ .Env.GORELEASER_GITHUB_TOKEN }}" # This token can access the repo, but GITHUB_TOKEN cannot
commit_author:
name: stripe-ci
email: [email protected]
homepage: https://stripe.com
description: Stripe CLI utility
license: Apache 2.0
version_template: "{{ .Version }}-next"
scoops:
- repository:
owner: stripe
name: scoop-stripe-cli
token: "{{ .Env.GORELEASER_GITHUB_TOKEN }}" # This token can access the repo, but GITHUB_TOKEN cannot
commit_author:
name: stripe-ci
email: [email protected]
homepage: https://stripe.com
description: Stripe CLI utility
license: Apache 2.0
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PROTOC_FAILURE_MESSAGE="\nFailed to compile protobuf files: protoc exited with c
export GO111MODULE := on
export GOBIN := $(shell pwd)/bin
export PATH := $(GOBIN):$(PATH)
export GOLANGCI_LINT_VERSION := v1.48.0
export GOLANGCI_LINT_VERSION := v1.63.4

# Install all the build and lint dependencies
setup:
Expand Down
38 changes: 18 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/stripe/stripe-cli

go 1.19
go 1.22.0

require (
github.com/BurntSushi/toml v1.2.0
Expand All @@ -23,21 +23,21 @@ require (
github.com/otiai10/copy v1.7.0
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sirupsen/logrus v1.9.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/afero v1.9.2
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.12.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
github.com/tidwall/gjson v1.14.2
github.com/tidwall/pretty v1.2.0
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0
golang.org/x/term v0.18.0
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0
golang.org/x/term v0.28.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
gopkg.in/ini.v1 v1.67.0 // indirect
Expand All @@ -46,37 +46,35 @@ require (

require (
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
github.com/go-git/go-git/v5 v5.12.0
github.com/go-git/go-git/v5 v5.13.0
github.com/hashicorp/go-hclog v1.2.2
github.com/hashicorp/go-plugin v1.4.4
github.com/joho/godotenv v1.4.0
)

require (
dario.cat/mergo v1.0.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/ProtonMail/go-crypto v1.1.5 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/tools v0.13.0 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
github.com/99designs/keyring v1.2.1
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
Expand All @@ -98,6 +96,6 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.4.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
Loading

0 comments on commit 059befe

Please sign in to comment.