Skip to content

Commit 99a075f

Browse files
per1234per1234
authored
Merge pull request #352 from per1234/bump-go
Update to using Go 1.17 for project
2 parents f1d75f2 + 80bf21e commit 99a075f

15 files changed

+315
-112
lines changed

‎.github/workflows/check-code-generation-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Check Code Generation
22

33
env:
44
# See: https://github.com/actions/setup-go/tree/v2#readme
5-
GO_VERSION: "1.16"
5+
GO_VERSION: "1.17"
66

77
on:
88
create:

‎.github/workflows/check-go-dependencies-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check Go Dependencies
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/v2#readme
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.17"
77

88
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
99
on:

‎.github/workflows/check-go-task.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check Go
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/v2#readme
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.17"
77

88
# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
99
on:
@@ -222,9 +222,16 @@ jobs:
222222
with:
223223
go-version: ${{ env.GO_VERSION }}
224224

225+
- name: Install Task
226+
uses: arduino/setup-task@v1
227+
with:
228+
repo-token: ${{ secrets.GITHUB_TOKEN }}
229+
version: 3.x
230+
225231
- name: Run go mod tidy
226-
working-directory: ${{ matrix.module.path }}
227-
run: go mod tidy
232+
env:
233+
GO_MODULE_PATH: ${{ matrix.module.path }}
234+
run: task go:tidy
228235

229236
- name: Check whether any tidying was needed
230237
run: git diff --color --exit-code

‎.github/workflows/check-mkdocs-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check Website
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/v2#readme
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.17"
77
# See: https://github.com/actions/setup-python/tree/v2#available-versions-of-python
88
PYTHON_VERSION: "3.9"
99

‎.github/workflows/test-go-integration-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test Integration
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/v2#readme
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.17"
77
# See: https://github.com/actions/setup-python/tree/v2#available-versions-of-python
88
PYTHON_VERSION: "3.9"
99

‎.github/workflows/test-go-task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test Go
33

44
env:
55
# See: https://github.com/actions/setup-go/tree/v2#readme
6-
GO_VERSION: "1.16"
6+
GO_VERSION: "1.17"
77

88
# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
99
on:

‎DistTasks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ version: "3"
1919

2020
vars:
2121
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
22-
GO_VERSION: "1.16.4"
22+
GO_VERSION: "1.17.8"
2323
CHECKSUM_FILE: "{{.VERSION}}-checksums.txt"
2424

2525
tasks:

‎Taskfile.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,24 @@ tasks:
5555
- task: general:check-formatting
5656
- task: general:check-spelling
5757
- task: go:test
58+
- task: go:test
59+
vars:
60+
GO_MODULE_PATH: ./ruledocsgen
5861
- task: go:test-integration
5962
- task: go:vet
63+
- task: go:vet
64+
vars:
65+
GO_MODULE_PATH: ./docsgen
66+
- task: go:vet
67+
vars:
68+
GO_MODULE_PATH: ./ruledocsgen
69+
- task: go:lint
6070
- task: go:lint
71+
vars:
72+
GO_MODULE_PATH: ./docsgen
73+
- task: go:lint
74+
vars:
75+
GO_MODULE_PATH: ./ruledocsgen
6176
- task: markdown:lint
6277
- task: markdown:check-links
6378
- task: python:lint
@@ -72,7 +87,26 @@ tasks:
7287
- task: general:correct-spelling
7388
- task: go:generate
7489
- task: go:fix
90+
- task: go:fix
91+
vars:
92+
GO_MODULE_PATH: ./docsgen
93+
- task: go:fix
94+
vars:
95+
GO_MODULE_PATH: ./ruledocsgen
7596
- task: go:format
97+
- task: go:format
98+
vars:
99+
GO_MODULE_PATH: ./docsgen
100+
- task: go:format
101+
vars:
102+
GO_MODULE_PATH: ./ruledocsgen
103+
- task: go:tidy
104+
- task: go:tidy
105+
vars:
106+
GO_MODULE_PATH: ./docsgen
107+
- task: go:tidy
108+
vars:
109+
GO_MODULE_PATH: ./ruledocsgen
76110
- task: markdown:fix
77111
- task: python:format
78112
- task: shell:format
@@ -266,6 +300,15 @@ tasks:
266300
- poetry run pytest tests
267301
- poetry run pytest ruledocsgen/tests
268302

303+
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-go-task/Taskfile.yml
304+
go:tidy:
305+
desc: Refresh dependency metadata
306+
dir: "{{default .DEFAULT_GO_MODULE_PATH .GO_MODULE_PATH}}"
307+
vars:
308+
GO_VERSION: 1.17
309+
cmds:
310+
- go mod tidy -compat={{.GO_VERSION}}
311+
269312
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/check-go-task/Taskfile.yml
270313
go:vet:
271314
desc: Check for errors in Go code

‎docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ submitting a PR:
7676

7777
To build Arduino Lint from sources you need the following tools to be available in your local environment:
7878

79-
- [Go](https://golang.org/doc/install) version 1.16 or later
79+
- [Go](https://golang.org/doc/install) version 1.17 or later
8080
- [Taskfile](https://taskfile.dev/#/installation) to help you run the most common tasks from the command line
8181

8282
If you want to run integration tests or work on documentation, you will also need:

‎docsgen/go.mod

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/cobra/docsgen/go.mod
22
module github.com/arduino/arduino-lint/docsgen
33

4-
go 1.16
4+
go 1.17
55

66
replace github.com/arduino/arduino-lint => ../
77

@@ -13,3 +13,90 @@ require (
1313
github.com/arduino/arduino-lint v0.0.0
1414
github.com/spf13/cobra v1.3.0
1515
)
16+
17+
require (
18+
github.com/Microsoft/go-winio v0.4.16 // indirect
19+
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
20+
github.com/acomagu/bufpipe v1.0.3 // indirect
21+
github.com/arduino/arduino-cli v0.0.0-20201210103408-bf7a3194bb63 // indirect
22+
github.com/arduino/go-paths-helper v1.7.0 // indirect
23+
github.com/arduino/go-properties-orderedmap v1.7.0 // indirect
24+
github.com/cespare/xxhash v1.1.0 // indirect
25+
github.com/client9/misspell v0.3.4 // indirect
26+
github.com/cmaglie/go.rice v1.0.3 // indirect
27+
github.com/codeclysm/extract/v3 v3.0.2 // indirect
28+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
29+
github.com/daaku/go.zipexe v1.0.1 // indirect
30+
github.com/davecgh/go-spew v1.1.1 // indirect
31+
github.com/dgraph-io/ristretto v0.0.3 // indirect
32+
github.com/emirpasic/gods v1.12.0 // indirect
33+
github.com/fsnotify/fsnotify v1.5.1 // indirect
34+
github.com/go-git/gcfg v1.5.0 // indirect
35+
github.com/go-git/go-billy/v5 v5.3.1 // indirect
36+
github.com/go-git/go-git/v5 v5.4.2 // indirect
37+
github.com/gobuffalo/pop/v5 v5.3.3 // indirect
38+
github.com/golang/protobuf v1.5.2 // indirect
39+
github.com/google/uuid v1.2.0 // indirect
40+
github.com/h2non/filetype v1.1.0 // indirect
41+
github.com/hashicorp/hcl v1.0.0 // indirect
42+
github.com/imdario/mergo v0.3.12 // indirect
43+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
44+
github.com/jandelgado/gcov2lcov v1.0.4 // indirect
45+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
46+
github.com/juju/errors v0.0.0-20200330140219-3fe23663418f // indirect
47+
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
48+
github.com/magiconair/properties v1.8.5 // indirect
49+
github.com/mattn/go-runewidth v0.0.9 // indirect
50+
github.com/mitchellh/go-homedir v1.1.0 // indirect
51+
github.com/mitchellh/mapstructure v1.4.3 // indirect
52+
github.com/olekukonko/tablewriter v0.0.5 // indirect
53+
github.com/ory/go-acc v0.2.6 // indirect
54+
github.com/ory/jsonschema/v3 v3.0.4 // indirect
55+
github.com/ory/viper v1.7.5 // indirect
56+
github.com/ory/x v0.0.272 // indirect
57+
github.com/pborman/uuid v1.2.1 // indirect
58+
github.com/pelletier/go-toml v1.9.4 // indirect
59+
github.com/pkg/errors v0.9.1 // indirect
60+
github.com/pmezard/go-difflib v1.0.0 // indirect
61+
github.com/pmylund/sortutil v0.0.0-20120526081524-abeda66eb583 // indirect
62+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
63+
github.com/seatgeek/logrus-gelf-formatter v0.0.0-20210414080842-5b05eb8ff761 // indirect
64+
github.com/sergi/go-diff v1.1.0 // indirect
65+
github.com/sirupsen/logrus v1.8.1 // indirect
66+
github.com/spf13/afero v1.6.0 // indirect
67+
github.com/spf13/cast v1.4.1 // indirect
68+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
69+
github.com/spf13/pflag v1.0.5 // indirect
70+
github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518 // indirect
71+
github.com/src-d/gcfg v1.4.0 // indirect
72+
github.com/stretchr/testify v1.7.0 // indirect
73+
github.com/subosito/gotenv v1.2.0 // indirect
74+
github.com/xanzy/ssh-agent v0.3.0 // indirect
75+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
76+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
77+
go.bug.st/cleanup v1.0.0 // indirect
78+
go.bug.st/downloader/v2 v2.1.0 // indirect
79+
go.bug.st/relaxed-semver v0.0.0-20190922224835-391e10178d18 // indirect
80+
go.opentelemetry.io/contrib v0.20.0 // indirect
81+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.20.0 // indirect
82+
go.opentelemetry.io/otel v0.20.0 // indirect
83+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
84+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
85+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
86+
golang.org/x/mod v0.5.0 // indirect
87+
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
88+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
89+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
90+
golang.org/x/text v0.3.7 // indirect
91+
golang.org/x/tools v0.1.5 // indirect
92+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
93+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
94+
google.golang.org/grpc v1.42.0 // indirect
95+
google.golang.org/protobuf v1.27.1 // indirect
96+
gopkg.in/ini.v1 v1.66.2 // indirect
97+
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
98+
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
99+
gopkg.in/warnings.v0 v0.1.2 // indirect
100+
gopkg.in/yaml.v2 v2.4.0 // indirect
101+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
102+
)

0 commit comments

Comments
 (0)