Skip to content

Commit 8865a98

Browse files
petemoorepetemoore
committed
Upgrade to go 1.18.5, golangci-lint 1.47.3
1 parent 25972b1 commit 8865a98

File tree

8 files changed

+91
-61
lines changed

8 files changed

+91
-61
lines changed

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
go1.18.4
1+
go1.18.5

‎.golangci-lint-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.46.2
1+
1.47.3

‎changelog/euFqp_QnRZCGk8aCq3ODGQ.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
audience: general
2+
level: patch
3+
---
4+
Update go version from 1.18.4 to 1.18.5 for building generic-worker, livelog, taskcluster-proxy, start-worker, and the taskcluster cli.
5+
Update golangci-lint from 1.46.2 to 1.47.3 for linting go code.

‎dev-docs/development-process.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We use `yarn` to run most development commands, so [install that as well](https:
1818
### Go
1919

2020
<!-- the next line is automatically edited; do not change -->
21-
Go version go1.18.4 is required for some development tasks, in particular to run `yarn generate`.
21+
Go version go1.18.5 is required for some development tasks, in particular to run `yarn generate`.
2222
For new contributors not familiar with Go, it's probably safe to skip installing Go for now -- you will see a helpful error if and when it is needed.
2323
We recommend using https://github.com/moovweb/gvm to support installing multiple Go versions.
2424

‎dev-docs/node-and-go-upgrades.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ To update the node version:
2323

2424
To update the go version:
2525

26-
* Install the new go version, such as `gvm install go1.18.4`
27-
* Use the new go version, such as `gvm use go1.18.4`
26+
* Install the new go version, such as `gvm install go1.18.5`
27+
* Use the new go version, such as `gvm use go1.18.5`
2828
* Download modules with `go mod download`
2929
* Update `.go-version`
3030
* Run `yarn generate`. Some `go` errors may occur, for example on major version updates.

‎workers/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Simple generic worker
22

3-
FROM golang:1.18.4-buster as build
3+
FROM golang:1.18.5-buster as build
44

55
WORKDIR /app
66

‎workers/generic-worker/gw-decision-task/tasks.yml‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Types:
66
Mounts:
77
# The next line is edited by infrastructure/tooling/src/generate/generators/go-version.js
88
# DO NOT CHANGE HERE!
9-
- 'go1.18.4'
9+
- 'go1.18.5'
1010
- 'git2.37.1'
1111
- 'jq1.6'
1212
- 'ci-creds'
1313
# The next line is edited by infrastructure/tooling/src/generate/generators/golangci-lint-version.js
1414
# DO NOT CHANGE HERE!
15-
- 'golangci-lint-1.46.2'
15+
- 'golangci-lint-1.47.3'
1616
Command: BuildAndTest
1717
Features:
1818
taskclusterProxy: true
@@ -23,7 +23,7 @@ Types:
2323
- Name: 'public/build/generic-worker-${OS}-${ARCH}${EXTENSION}'
2424
# The next line is edited by infrastructure/tooling/src/generate/generators/go-version.js
2525
# DO NOT CHANGE HERE!
26-
Path: 'gopath1.18.4/bin/generic-worker${EXTENSION}'
26+
Path: 'gopath1.18.5/bin/generic-worker${EXTENSION}'
2727
Type: 'file'
2828
MaxRunTime: 3600
2929

@@ -40,7 +40,7 @@ Types:
4040
Mounts:
4141
# The next line is edited by infrastructure/tooling/src/generate/generators/go-version.js
4242
# DO NOT CHANGE HERE!
43-
- 'go1.18.4'
43+
- 'go1.18.5'
4444
Command: FormatSource
4545
MaxRunTime: 3600
4646

@@ -119,7 +119,7 @@ WorkerPools:
119119
# The next comment is edited by infrastructure/tooling/src/generate/generators/go-version.js
120120
# DO NOT CHANGE HERE!
121121

122-
# There is no arm release for go 1.18.4 on windows, but 386 release works
122+
# There is no arm release for go 1.18.5 on windows, but 386 release works
123123
# through emulation provided by the host OS.
124124
Arch: '386'
125125
proj-taskcluster/gw-ci-windows2012r2-amd64:
@@ -140,7 +140,7 @@ Commands:
140140
export CGO_ENABLED=0
141141
# The next line is edited by infrastructure/tooling/src/generate/generators/go-version.js
142142
# DO NOT CHANGE HERE!
143-
export GOROOT="$(pwd)/go1.18.4/go"
143+
export GOROOT="$(pwd)/go1.18.5/go"
144144
export PATH="${GOROOT}/bin:${PATH}"
145145
go version
146146
go env
@@ -193,8 +193,8 @@ Commands:
193193
194194
# The next two lines are edited by infrastructure/tooling/src/generate/generators/go-version.js
195195
# DO NOT CHANGE HERE!
196-
export GOROOT="$(pwd)/go1.18.4/go"
197-
export GOPATH="$(pwd)/gopath1.18.4"
196+
export GOROOT="$(pwd)/go1.18.5/go"
197+
export GOPATH="$(pwd)/gopath1.18.5"
198198
199199
export PATH="${GOPATH}/bin:${GOROOT}/bin:$(pwd)/bin:${PATH}"
200200
git --version
@@ -236,7 +236,7 @@ Commands:
236236
237237
# The next line is edited by infrastructure/tooling/src/generate/generators/golangci-lint-version.js
238238
# DO NOT CHANGE HERE!
239-
../../../golangci-lint/golangci-lint-1.46.2-*/golangci-lint run --build-tags "${ENGINE}" --timeout=15m
239+
../../../golangci-lint/golangci-lint-1.47.3-*/golangci-lint run --build-tags "${ENGINE}" --timeout=15m
240240
241241
Windows:
242242
- |
@@ -257,8 +257,8 @@ Commands:
257257

258258
# The next two lines are edited by infrastructure/tooling/src/generate/generators/go-version.js
259259
# DO NOT CHANGE HERE!
260-
- set GOROOT=%CD%\go1.18.4\go
261-
- set GOPATH=%CD%\gopath1.18.4
260+
- set GOROOT=%CD%\go1.18.5\go
261+
- set GOPATH=%CD%\gopath1.18.5
262262

263263
- |
264264
:: temporarily add C:\cygwin\bin to PATH - if this works out well, we should probably do it in system setup instead (i.e. in default system PATH of the image set)
@@ -317,10 +317,10 @@ Commands:
317317
:: assumption here is that if something inside the if fails, we'll get a non zero exit code
318318
:: i've also made it an if/else so that one of them has to run, as there should always be a
319319
:: linter
320-
if exist ..\..\..\golangci-lint\golangci-lint-1.46.2-windows-amd64 (
321-
..\..\..\golangci-lint\golangci-lint-1.46.2-windows-amd64\golangci-lint.exe run --build-tags "%ENGINE%" --timeout=15m
320+
if exist ..\..\..\golangci-lint\golangci-lint-1.47.3-windows-amd64 (
321+
..\..\..\golangci-lint\golangci-lint-1.47.3-windows-amd64\golangci-lint.exe run --build-tags "%ENGINE%" --timeout=15m
322322
) else (
323-
..\..\..\golangci-lint\golangci-lint-1.46.2-windows-386\golangci-lint.exe run --build-tags "%ENGINE%" --timeout=15m
323+
..\..\..\golangci-lint\golangci-lint-1.47.3-windows-386\golangci-lint.exe run --build-tags "%ENGINE%" --timeout=15m
324324
)
325325
326326
Mounts:
@@ -332,34 +332,34 @@ Mounts:
332332
#
333333
################################################################################
334334

335-
go1.18.4:
336-
directory: go1.18.4
335+
go1.18.5:
336+
directory: go1.18.5
337337
content:
338338
darwin:
339339
amd64:
340-
url: 'https://storage.googleapis.com/golang/go1.18.4.darwin-amd64.tar.gz'
341-
sha256: '315e1a2b21a827c68da1b7f492b5dcbe81d8df8a79ebe50922df9588893f87f0'
340+
url: 'https://storage.googleapis.com/golang/go1.18.5.darwin-amd64.tar.gz'
341+
sha256: '828eeca8b5abea3e56921df8fa4b1101380a5ebcfee10acbc8ffe7ec0bf5876b'
342342
format: tar.gz
343343
arm64:
344-
url: 'https://storage.googleapis.com/golang/go1.18.4.darwin-arm64.tar.gz'
345-
sha256: '04eed623d5143ffa44965b618b509e0beccccfd3a4a1bfebc0cdbcf906046769'
344+
url: 'https://storage.googleapis.com/golang/go1.18.5.darwin-arm64.tar.gz'
345+
sha256: '7a27dbe31c9fdd98be83ed6ce76fa5474044a2d960e2f9db8fa92b256dda2e58'
346346
linux:
347347
armv6l:
348-
url: 'https://storage.googleapis.com/golang/go1.18.4.linux-armv6l.tar.gz'
349-
sha256: '7dfeab572e49638b0f3d9901457f0622c27b73301c2b99db9f5e9568ff40460c'
348+
url: 'https://storage.googleapis.com/golang/go1.18.5.linux-armv6l.tar.gz'
349+
sha256: 'd5ac34ac5f060a5274319aa04b7b11e41b123bd7887d64efb5f44ead236957af'
350350
format: tar.gz
351351
amd64:
352-
url: 'https://storage.googleapis.com/golang/go1.18.4.linux-amd64.tar.gz'
353-
sha256: 'c9b099b68d93f5c5c8a8844a89f8db07eaa58270e3a1e01804f17f4cf8df02f5'
352+
url: 'https://storage.googleapis.com/golang/go1.18.5.linux-amd64.tar.gz'
353+
sha256: '9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2'
354354
format: tar.gz
355355
windows:
356356
386:
357-
url: 'https://storage.googleapis.com/golang/go1.18.4.windows-386.zip'
358-
sha256: '6343010a13ab783e553786b3cc3b4d63080128f61cf1e963505139c71ca66a0d'
357+
url: 'https://storage.googleapis.com/golang/go1.18.5.windows-386.zip'
358+
sha256: '7b3142ec0c5db991e7f73a231662a92429b90ee151fe47557acb566d8d9ae4d3'
359359
format: zip
360360
amd64:
361-
url: 'https://storage.googleapis.com/golang/go1.18.4.windows-amd64.zip'
362-
sha256: 'dfb93c517e050ba0cfc066802b38a8e7cda2ef666efd634859356b33f543cc49'
361+
url: 'https://storage.googleapis.com/golang/go1.18.5.windows-amd64.zip'
362+
sha256: '73753620602d4b4469770040c53db55e5dd6af2ad07ecc18f71f164c3224eaad'
363363
format: zip
364364
git2.37.1:
365365
directory: git
@@ -397,7 +397,7 @@ Mounts:
397397
#
398398
################################################################################
399399

400-
golangci-lint-1.46.2:
400+
golangci-lint-1.47.3:
401401
# Note - we can't extract to directory '.' since after generic-worker
402402
# extracts the files as the root user (since generic-worker runs as root),
403403
# it then runs chown recursively against the target directory to make it
@@ -410,24 +410,28 @@ Mounts:
410410
content:
411411
darwin:
412412
amd64:
413-
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.46.2/golangci-lint-1.46.2-darwin-amd64.tar.gz'
414-
sha256: '658078aaaf7608693f37c4cf1380b2af418ab8b2d23fdb33e7e2d4339328590e'
413+
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.47.3/golangci-lint-1.47.3-darwin-amd64.tar.gz'
414+
sha256: '75ff9491f1ac88ab8594d0498d2a86168ad20e3f4b958dd21be8a6c2988d50cf'
415+
format: tar.gz
416+
arm64:
417+
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.47.3/golangci-lint-1.47.3-darwin-amd64.tar.gz'
418+
sha256: '589ea0d8fa80b37a94c4f54479a9cd89c9187e5cb123214d45227b67110f207d'
415419
format: tar.gz
416420
linux:
417421
armv6l:
418-
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.46.2/golangci-lint-1.46.2-linux-armv6.tar.gz'
419-
sha256: '177f5210ef04aee282bfbc6ec519d36af5fb7d2b2c8d3f4ea5e59fdba71b0a27'
422+
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.47.3/golangci-lint-1.47.3-linux-armv6.tar.gz'
423+
sha256: '6bfb63d31430067bc846992cf08b5070d32bb6e33b1b72b4898d0d3e0aac6456'
420424
format: tar.gz
421425
amd64:
422-
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.46.2/golangci-lint-1.46.2-linux-amd64.tar.gz'
423-
sha256: '242cd4f2d6ac0556e315192e8555784d13da5d1874e51304711570769c4f2b9b'
426+
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.47.3/golangci-lint-1.47.3-linux-amd64.tar.gz'
427+
sha256: '67b5f7a2275d94034c5c87ff7655ba4b20bdb5f83c43c5d22476f2bf5c6766ef'
424428
format: tar.gz
425429
windows:
426430
386:
427-
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.46.2/golangci-lint-1.46.2-windows-386.zip'
428-
sha256: 'b48a421ec12a43f8fc8f977b9cf7d4a1ea1c4b97f803a238de7d3ce4ab23a84b'
431+
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.47.3/golangci-lint-1.47.3-windows-386.zip'
432+
sha256: 'aef6d5c7f92837fbbb7426f35bc400efcfdb49fc6b20eea3e77dfc305a2231a7'
429433
format: zip
430434
amd64:
431-
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.46.2/golangci-lint-1.46.2-windows-amd64.zip'
432-
sha256: '604acc1378a566abb0eac799362f3a37b7fcb5fa2268aeb2d5d954c829367301'
435+
url: 'https://github.com/golangci/golangci-lint/releases/download/v1.47.3/golangci-lint-1.47.3-windows-amd64.zip'
436+
sha256: '719d4bace44dcc6c6b3d1826b4226ab7218911ba2cab1034aaab639fe61ebc67'
433437
format: zip

‎yarn.lock‎

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3343,7 +3343,7 @@ googleapis@^73.0.0:
33433343
google-auth-library "^7.0.2"
33443344
googleapis-common "^5.0.2"
33453345

3346-
got@^11.7.0:
3346+
got@^11.7.0, got@^11.8.1:
33473347
version "11.8.5"
33483348
resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
33493349
integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
@@ -3488,7 +3488,7 @@ hashids@^2.0.0:
34883488
resolved "https://registry.yarnpkg.com/hashids/-/hashids-2.2.10.tgz#82f45538cf03ce73e31b78d1abe78d287cf760c4"
34893489
integrity sha512-nXnYums7F8B5Y+GSThutLPlKMaamW1yjWNZVt0WModiJfdjaDZHnhYTWblS+h1OoBx3yjwiBwxldPP3nIbFSSA==
34903490

3491-
[email protected]:
3491+
[email protected], hawk@^9.0.1:
34923492
version "9.0.1"
34933493
resolved "https://registry.yarnpkg.com/hawk/-/hawk-9.0.1.tgz#0be51769103e76fe97a97ae7fa356c313bb93160"
34943494
integrity sha512-H2E+5ATFEXmorgVzYl3NzG3PCo2e+euYrHDnRpLLdOtJrQHGRXrJT9/joWnrkHCtzDZkaNoLXg/+TsSkD06eNg==
@@ -4286,7 +4286,7 @@ lodash.truncate@^4.4.2:
42864286
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
42874287
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
42884288

4289-
[email protected], lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.5:
4289+
[email protected], lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5:
42904290
version "4.17.21"
42914291
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
42924292
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6017,6 +6017,13 @@ slugid@^2.0.0:
60176017
uuid "^3.2.1"
60186018
uuid-parse "^1.0.0"
60196019

6020+
slugid@^3.0.0:
6021+
version "3.0.0"
6022+
resolved "https://registry.yarnpkg.com/slugid/-/slugid-3.0.0.tgz#57cb692641a20feb4a1d774b2ad11594c9aa6125"
6023+
integrity sha512-MIir9SJS6BQFjFg8DHGMgPkDg21huT0+kYHiS6NkkWZXHSEdgIECo3nUVEG3GDkmecBTy+zRs6pCvPhpk4bKcg==
6024+
dependencies:
6025+
uuid "^8.3.2"
6026+
60206027
snake-case@^3.0.3:
60216028
version "3.0.4"
60226029
resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
@@ -6286,39 +6293,51 @@ tar-stream@^2.0.0:
62866293

62876294
"taskcluster-client@link:clients/client":
62886295
version "0.0.0"
6296+
uid ""
62896297

62906298
"taskcluster-db@link:db":
6291-
version "44.17.0"
6299+
version "0.0.0"
6300+
uid ""
62926301

62936302
"taskcluster-lib-api@link:libraries/api":
6294-
version "44.17.0"
6303+
version "0.0.0"
6304+
uid ""
62956305

62966306
"taskcluster-lib-app@link:libraries/app":
6297-
version "44.17.0"
6307+
version "0.0.0"
6308+
uid ""
62986309

62996310
"taskcluster-lib-azqueue@link:libraries/azqueue":
6300-
version "44.17.0"
6311+
version "0.0.0"
6312+
uid ""
63016313

63026314
"taskcluster-lib-config@link:libraries/config":
6303-
version "44.17.0"
6315+
version "0.0.0"
6316+
uid ""
63046317

63056318
"taskcluster-lib-iterate@link:libraries/iterate":
6306-
version "44.17.0"
6319+
version "0.0.0"
6320+
uid ""
63076321

63086322
"taskcluster-lib-loader@link:libraries/loader":
6309-
version "44.17.0"
6323+
version "0.0.0"
6324+
uid ""
63106325

63116326
"taskcluster-lib-monitor@link:libraries/monitor":
6312-
version "44.17.0"
6327+
version "0.0.0"
6328+
uid ""
63136329

63146330
"taskcluster-lib-postgres@link:libraries/postgres":
6315-
version "44.17.0"
6331+
version "0.0.0"
6332+
uid ""
63166333

63176334
"taskcluster-lib-pulse@link:libraries/pulse":
6318-
version "44.17.0"
6335+
version "0.0.0"
6336+
uid ""
63196337

63206338
"taskcluster-lib-references@link:libraries/references":
6321-
version "44.17.0"
6339+
version "0.0.0"
6340+
uid ""
63226341

63236342
taskcluster-lib-scopes@^11.0.0:
63246343
version "11.0.0"
@@ -6328,15 +6347,17 @@ taskcluster-lib-scopes@^11.0.0:
63286347
fast-json-stable-stringify "^2.1.0"
63296348

63306349
"taskcluster-lib-testing@link:libraries/testing":
6331-
version "44.17.0"
6350+
version "0.0.0"
6351+
uid ""
63326352

63336353
taskcluster-lib-urls@^13.0.0:
63346354
version "13.0.1"
63356355
resolved "https://registry.yarnpkg.com/taskcluster-lib-urls/-/taskcluster-lib-urls-13.0.1.tgz#773da8bb9937a52f77ad128961b8d501dfdd042a"
63366356
integrity sha512-WrhKMbiWmpPrB0vbzLZq4W35mhdPVLklZY+qrBoI7KQzFAjO/qsgS8ssHL6eYmvBf4fE7C+C9ZFxQpQOUynQvg==
63376357

63386358
"taskcluster-lib-validate@link:libraries/validate":
6339-
version "44.17.0"
6359+
version "0.0.0"
6360+
uid ""
63406361

63416362
test-exclude@^6.0.0:
63426363
version "6.0.0"

0 commit comments

Comments
 (0)