Skip to content

Commit 597eb16

Browse files
authored
Upgrade to go 1.18 (cli#5542)
1 parent 9666857 commit 597eb16

File tree

6 files changed

+38
-14
lines changed

6 files changed

+38
-14
lines changed

.github/workflows/go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414

1515
steps:
16-
- name: Set up Go 1.16
16+
- name: Set up Go 1.18
1717
uses: actions/setup-go@v3
1818
with:
19-
go-version: 1.16
19+
go-version: 1.18
2020

2121
- name: Check out code
2222
uses: actions/checkout@v3

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- name: Set up Go 1.16
22+
- name: Set up Go 1.18
2323
uses: actions/setup-go@v3
2424
with:
25-
go-version: 1.16
25+
go-version: 1.18
2626

2727
- name: Check out code
2828
uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
4040
go mod verify
4141
go mod download
4242
43-
LINT_VERSION=1.44.2
43+
LINT_VERSION=1.45.2
4444
curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \
4545
tar xz --strip-components 1 --wildcards \*/golangci-lint
4646
mkdir -p bin && mv golangci-lint bin/

.github/workflows/releases.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v3
18-
- name: Set up Go 1.16
18+
- name: Set up Go 1.18
1919
uses: actions/setup-go@v3
2020
with:
21-
go-version: 1.16
21+
go-version: 1.18
2222
- name: Generate changelog
2323
id: changelog
2424
run: |

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
linters:
22
enable:
33
- gofmt
4-
- nolintlint
54

65
issues:
76
max-issues-per-linter: 0

docs/source.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Installation from source
22

3-
1. Verify that you have Go 1.16+ installed
3+
1. Verify that you have Go 1.18+ installed
44

55
```sh
66
$ go version
@@ -21,12 +21,12 @@
2121
```sh
2222
# installs to '/usr/local' by default; sudo may be required
2323
$ make install
24-
24+
2525
# or, install to a different location
2626
$ make install prefix=/path/to/gh
2727
```
2828

29-
#### Windows
29+
#### Windows
3030
```pwsh
3131
# build the `bin\gh.exe` binary
3232
> go run script\build.go

go.mod

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

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.4
@@ -32,17 +32,42 @@ require (
3232
github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38
3333
github.com/opentracing/opentracing-go v1.1.0
3434
github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b
35-
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
3635
github.com/sourcegraph/jsonrpc2 v0.1.0
3736
github.com/spf13/cobra v1.4.0
3837
github.com/spf13/pflag v1.0.5
3938
github.com/stretchr/testify v1.7.1
4039
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
41-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
4240
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
4341
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
4442
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
4543
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
4644
)
4745

46+
require (
47+
github.com/alecthomas/chroma v0.10.0 // indirect
48+
github.com/aymerick/douceur v0.2.0 // indirect
49+
github.com/davecgh/go-spew v1.1.1 // indirect
50+
github.com/dlclark/regexp2 v1.4.0 // indirect
51+
github.com/fatih/color v1.7.0 // indirect
52+
github.com/gorilla/css v1.0.0 // indirect
53+
github.com/hashicorp/errwrap v1.0.0 // indirect
54+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
55+
github.com/itchyny/timefmt-go v0.1.3 // indirect
56+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
57+
github.com/mattn/go-runewidth v0.0.13 // indirect
58+
github.com/microcosm-cc/bluemonday v1.0.17 // indirect
59+
github.com/olekukonko/tablewriter v0.0.5 // indirect
60+
github.com/pmezard/go-difflib v1.0.0 // indirect
61+
github.com/rivo/uniseg v0.2.0 // indirect
62+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
63+
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
64+
github.com/stretchr/objx v0.1.0 // indirect
65+
github.com/yuin/goldmark v1.4.4 // indirect
66+
github.com/yuin/goldmark-emoji v1.0.1 // indirect
67+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
68+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
69+
golang.org/x/text v0.3.7 // indirect
70+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
71+
)
72+
4873
replace golang.org/x/crypto => github.com/cli/crypto v0.0.0-20210929142629-6be313f59b03

0 commit comments

Comments
 (0)