Skip to content

Commit 466a2c7

Browse files
Revert changes to go version (#1290)
* Revert "update go version for goreleaser to 1.22.0 (#1288)" This reverts commit 0eab402. * Revert "update deps, linter (#1287)" This reverts commit f1e69c5.
1 parent 0eab402 commit 466a2c7

File tree

7 files changed

+101
-95
lines changed

7 files changed

+101
-95
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.22.0
22+
go-version: 1.19
2323
- name: Run GoReleaser
2424
uses: goreleaser/goreleaser-action@v5
2525
with:

.github/workflows/test-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Set up Go
3636
uses: actions/setup-go@v2
3737
with:
38-
go-version: 1.22.0
38+
go-version: 1.19
3939
- name: Run GoReleaser Snapshot
4040
uses: goreleaser/goreleaser-action@v2
4141
with:

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-version: [1.22.0]
7+
go-version: [1.19.x]
88
platform: [ubuntu-latest, macos-latest, windows-latest]
99
runs-on: ${{ matrix.platform }}
1010
steps:
@@ -37,7 +37,7 @@ jobs:
3737
- name: golangci-lint
3838
uses: golangci/golangci-lint-action@v6
3939
with:
40-
version: v1.63.4
40+
version: v1.48
4141
- name: Run Tests
4242
run: make ci
4343
shell: bash

.golangci.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ linters:
55
disable-all: true
66
enable:
77
- bodyclose
8+
- deadcode
89
- depguard
910
- dogsled
1011
- dupl
@@ -19,35 +20,21 @@ linters:
1920
- ineffassign
2021
- misspell
2122
- nakedret
22-
# - revive -- TODO: reenable after fixing errors
23+
- revive
2324
# - rowserrcheck -- disabled because of https://github.com/golangci/golangci-lint/issues/2649
2425
- staticcheck
2526
# - structcheck -- disabled because of https://github.com/golangci/golangci-lint/issues/2649
2627
- typecheck
2728
- unconvert
2829
- unused
30+
- varcheck
2931
- whitespace
3032

3133
linters-settings:
32-
depguard:
33-
rules:
34-
main:
35-
list-mode: lax
36-
allow:
37-
- $all
38-
deny: []
3934
goimports:
4035
local-prefixes: github.com/stripe/stripe-cli
41-
govet:
42-
disable:
43-
- printf
4436
misspell:
4537
locale: US
46-
staticcheck:
47-
checks:
48-
- all
49-
- -SA1006
50-
- -SA1019
5138

5239
issues:
5340
exclude-rules:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PROTOC_FAILURE_MESSAGE="\nFailed to compile protobuf files: protoc exited with c
66
export GO111MODULE := on
77
export GOBIN := $(shell pwd)/bin
88
export PATH := $(GOBIN):$(PATH)
9-
export GOLANGCI_LINT_VERSION := v1.63.4
9+
export GOLANGCI_LINT_VERSION := v1.48.0
1010

1111
# Install all the build and lint dependencies
1212
setup:

go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/stripe/stripe-cli
22

3-
go 1.22.0
4-
5-
toolchain go1.23.4
3+
go 1.19
64

75
require (
86
github.com/BurntSushi/toml v1.2.0
@@ -25,21 +23,21 @@ require (
2523
github.com/otiai10/copy v1.7.0
2624
github.com/pelletier/go-toml v1.9.5 // indirect
2725
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
28-
github.com/sirupsen/logrus v1.9.3
26+
github.com/sirupsen/logrus v1.9.0
2927
github.com/spf13/afero v1.9.2
3028
github.com/spf13/cast v1.5.0 // indirect
3129
github.com/spf13/cobra v1.5.0
3230
github.com/spf13/pflag v1.0.5
3331
github.com/spf13/viper v1.12.0
34-
github.com/stretchr/testify v1.10.0
32+
github.com/stretchr/testify v1.9.0
3533
github.com/tidwall/gjson v1.14.2
3634
github.com/tidwall/pretty v1.2.0
3735
github.com/x-cray/logrus-prefixed-formatter v0.5.2
3836
github.com/xanzy/ssh-agent v0.3.3 // indirect
39-
golang.org/x/crypto v0.32.0 // indirect
40-
golang.org/x/net v0.34.0 // indirect
41-
golang.org/x/sys v0.29.0
42-
golang.org/x/term v0.28.0
37+
golang.org/x/crypto v0.21.0 // indirect
38+
golang.org/x/net v0.23.0 // indirect
39+
golang.org/x/sys v0.18.0
40+
golang.org/x/term v0.18.0
4341
google.golang.org/grpc v1.63.2
4442
google.golang.org/protobuf v1.33.0
4543
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -48,35 +46,37 @@ require (
4846

4947
require (
5048
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
51-
github.com/go-git/go-git/v5 v5.13.0
49+
github.com/go-git/go-git/v5 v5.12.0
5250
github.com/hashicorp/go-hclog v1.2.2
5351
github.com/hashicorp/go-plugin v1.4.4
5452
github.com/joho/godotenv v1.4.0
5553
)
5654

5755
require (
58-
dario.cat/mergo v1.0.1 // indirect
56+
dario.cat/mergo v1.0.0 // indirect
5957
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
60-
github.com/ProtonMail/go-crypto v1.1.5 // indirect
61-
github.com/cloudflare/circl v1.5.0 // indirect
62-
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
58+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
59+
github.com/cloudflare/circl v1.3.7 // indirect
60+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6361
github.com/danieljoos/wincred v1.1.2 // indirect
6462
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
6563
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
66-
github.com/go-git/go-billy/v5 v5.6.2 // indirect
64+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
6765
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
68-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
66+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6967
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
7068
github.com/mtibben/percent v0.2.1 // indirect
71-
github.com/pjbgf/sha1cd v0.3.2 // indirect
72-
github.com/skeema/knownhosts v1.3.0 // indirect
69+
github.com/pjbgf/sha1cd v0.3.0 // indirect
70+
github.com/skeema/knownhosts v1.2.2 // indirect
71+
golang.org/x/mod v0.12.0 // indirect
72+
golang.org/x/tools v0.13.0 // indirect
7373
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
7474
gopkg.in/yaml.v3 v3.0.1 // indirect
7575
)
7676

7777
require (
7878
github.com/99designs/keyring v1.2.1
79-
github.com/Microsoft/go-winio v0.6.2 // indirect
79+
github.com/Microsoft/go-winio v0.6.1 // indirect
8080
github.com/chzyer/readline v1.5.1 // indirect
8181
github.com/davecgh/go-spew v1.1.1 // indirect
8282
github.com/emirpasic/gods v1.18.1 // indirect
@@ -98,6 +98,6 @@ require (
9898
github.com/spf13/jwalterweatherman v1.1.0 // indirect
9999
github.com/subosito/gotenv v1.4.0 // indirect
100100
github.com/tidwall/match v1.1.1 // indirect
101-
golang.org/x/text v0.21.0 // indirect
101+
golang.org/x/text v0.14.0 // indirect
102102
gopkg.in/warnings.v0 v0.1.2 // indirect
103103
)

0 commit comments

Comments
 (0)