Skip to content

Commit

Permalink
Upgrade to go 1.22 (#511)
Browse files Browse the repository at this point in the history
Bumping dependencies at the same time.
  • Loading branch information
sourishkrout authored Feb 21, 2024
1 parent cff4cd9 commit 511312f
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 105 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ["1.21"]
go: ["1.22"]
name: Lint with Go ${{ matrix.go }}
steps:
- uses: actions/checkout@v4
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: ["1.21"]
go: ["1.22"]
os: [ubuntu-latest, windows-latest]
name: Build and test with Go ${{ matrix.go }} on ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: ">=1.21"
go-version: ">=1.22"
- name: Install dependencies
run: make install/dev
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: "1.21"
go-version: "1.22"
- name: Auth to GCP
uses: google-github-actions/auth@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ The requisite tools can be installed with:
make install/goreleaser
```

## Upgrading to go 1.21
## Upgrading to go 1.22

After upgrading go to version 1.21, you'll need to make sure to reinstall dev packages, as some may be outdated:
After upgrading go to version 1.22, you'll need to make sure to reinstall dev packages, as some may be outdated:

```sh {"id":"01HF7BT3HF9WY615MNGREVYKFG","name":"upgrade-go-120"}
```sh {"id":"01HF7BT3HF9WY615MNGREVYKFG","name":"upgrade-go-1-22"}
make install/dev
```
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ pre-commit: build wasm test lint

.PHONY: install/dev
install/dev:
go install github.com/mgechev/revive@v1.2.3
go install github.com/securego/gosec/v2/cmd/gosec@v2.17.0
go install honnef.co/go/tools/cmd/staticcheck@v0.4.3
go install mvdan.cc/gofumpt@v0.3.1
go install github.com/mgechev/revive@v1.3.7
go install github.com/securego/gosec/v2/cmd/gosec@v2.19.0
go install honnef.co/go/tools/cmd/staticcheck@v0.4.6
go install mvdan.cc/gofumpt@v0.6.0
go install github.com/icholy/gomajor@v0.9.5

.PHONY: install/goreleaser
Expand Down
46 changes: 23 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
module github.com/stateful/runme

go 1.21
go 1.22

require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/Microsoft/go-winio v0.6.1
github.com/atotto/clipboard v0.1.4
github.com/charmbracelet/bubbletea v0.25.0
github.com/charmbracelet/lipgloss v0.9.1
github.com/cli/cli/v2 v2.42.1
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81
github.com/cli/cli/v2 v2.44.1
github.com/containerd/console v1.0.4
github.com/creack/pty v1.1.21
github.com/fatih/color v1.16.0
github.com/go-git/go-billy/v5 v5.5.0
Expand All @@ -24,26 +24,26 @@ require (
github.com/oklog/ulid/v2 v2.1.0
github.com/rogpeppe/go-internal v1.12.0
github.com/rwtodd/Go.Sed v0.0.0-20230610052213-ba3e9c186f0a
github.com/vektah/gqlparser/v2 v2.5.10
github.com/yuin/goldmark v1.6.0
github.com/vektah/gqlparser/v2 v2.5.11
github.com/yuin/goldmark v1.7.0
go.uber.org/multierr v1.11.0
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
golang.org/x/oauth2 v0.16.0
golang.org/x/sys v0.16.0
golang.org/x/term v0.16.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
golang.org/x/oauth2 v0.17.0
golang.org/x/sys v0.17.0
golang.org/x/term v0.17.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c
google.golang.org/protobuf v1.32.0
mvdan.cc/sh/v3 v3.7.0
mvdan.cc/sh/v3 v3.8.0
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/cli/go-gh/v2 v2.4.1-0.20231120145612-d32c104a9a25 // indirect
github.com/cli/go-gh/v2 v2.5.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/net v0.21.0 // indirect
)

require (
Expand All @@ -61,7 +61,7 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
Expand All @@ -71,29 +71,29 @@ require (
github.com/muesli/termenv v0.15.2 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.17.0 // indirect
golang.org/x/tools v0.18.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/Khan/genqlient v0.6.0
github.com/charmbracelet/bubbles v0.17.1
github.com/charmbracelet/bubbles v0.18.0
github.com/elliotchance/orderedmap v1.5.1
github.com/go-git/go-git/v5 v5.11.0
github.com/go-playground/assert/v2 v2.2.0
github.com/go-playground/validator/v10 v10.17.0
github.com/go-playground/validator/v10 v10.18.0
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/google/uuid v1.5.0
github.com/google/uuid v1.6.0
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/henvic/httpretty v0.1.3
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -104,7 +104,7 @@ require (
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.26.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.6.0
google.golang.org/grpc v1.60.1
google.golang.org/grpc v1.61.1
)
Loading

0 comments on commit 511312f

Please sign in to comment.