File tree Expand file tree Collapse file tree 6 files changed +22
-17
lines changed Expand file tree Collapse file tree 6 files changed +22
-17
lines changed Original file line number Diff line number Diff line change @@ -148,9 +148,8 @@ check_vet() {
148
148
149
149
# check_staticcheck runs staticcheck on source files.
150
150
check_staticcheck () {
151
- ensure_go_binary honnef.co/go/tools/cmd/staticcheck
152
- # runcmd staticcheck $(go list ./... | grep -v third_party | grep -v internal/doc | grep -v internal/render)
153
- echo " disabling staticcheck until go1.20 is supported"
151
+ ensure_go_binary honnef.co/go/tools/cmd/staticcheck
152
+ runcmd staticcheck $( go list ./... | grep -v third_party | grep -v internal/doc | grep -v internal/render)
154
153
}
155
154
156
155
# check_misspell runs misspell on source files.
@@ -318,6 +317,12 @@ main() {
318
317
# permissions or that don't test the code.
319
318
# Also, run the race detector on most tests.
320
319
local start=` date +%s`
320
+
321
+ # Explicitly mark the working directory as safe in CI.
322
+ # https://github.com/docker-library/golang/issues/452
323
+ local wd=$( pwd)
324
+ runcmd git config --system --add safe.directory ${wd}
325
+
321
326
standard_linters
322
327
# Print how long it takes to download dependencies and run the standard
323
328
# linters in CI.
Original file line number Diff line number Diff line change 22
22
args :
23
23
- $PROJECT_ID
24
24
- id : Check redistributable
25
- name : golang:1.20rc3
25
+ name : golang:1.20
26
26
entrypoint : private/devtools/check_redist.sh
27
27
- id : Build
28
28
name : gcr.io/cloud-builders/docker
48
48
- -c
49
49
- deploy/frontend.sh $_ENV gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
50
50
- id : Pagecheck
51
- name : golang:1.20rc3
51
+ name : golang:1.20
52
52
entrypoint : deploy/pagecheck.sh
53
53
args :
54
54
- $_ENV
Original file line number Diff line number Diff line change 22
22
args :
23
23
- $PROJECT_ID
24
24
- id : Check redistributable
25
- name : golang:1.20rc3
25
+ name : golang:1.20
26
26
entrypoint : private/devtools/check_redist.sh
27
27
- id : Build
28
28
name : gcr.io/cloud-builders/docker
48
48
- -c
49
49
- deploy/frontend.sh staging gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
50
50
- id : Pagecheck - staging
51
- name : golang:1.20rc3
51
+ name : golang:1.20
52
52
entrypoint : deploy/pagecheck.sh
53
53
args :
54
54
- staging
77
77
- -c
78
78
- deploy/frontend.sh prod gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
79
79
- id : Pagecheck - prod
80
- name : golang:1.20rc3
80
+ name : golang:1.20
81
81
entrypoint : deploy/pagecheck.sh
82
82
args :
83
83
- prod
88
88
- -c
89
89
- deploy/frontend.sh beta gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
90
90
- id : Pagecheck - beta
91
- name : golang:1.20rc3
91
+ name : golang:1.20
92
92
entrypoint : deploy/pagecheck.sh
93
93
args :
94
94
- beta
Original file line number Diff line number Diff line change 16
16
args :
17
17
- $PROJECT_ID
18
18
- id : Migrate
19
- name : golang:1.20rc3
19
+ name : golang:1.20
20
20
entrypoint : bash
21
21
dir : private
22
22
args :
Original file line number Diff line number Diff line change 9
9
args :
10
10
- $PROJECT_ID
11
11
- id : Build
12
- name : golang:1.20rc3
12
+ name : golang:1.20
13
13
entrypoint : bash
14
14
dir : private
15
15
args :
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ services:
31
31
depends_on :
32
32
- db
33
33
# This should match the version we are using on Cloud Run.
34
- image : golang:1.20rc3
34
+ image : golang:1.20
35
35
environment :
36
36
<< : *database-variables
37
37
<< : *go-variables
@@ -44,7 +44,7 @@ services:
44
44
- ../../:/pkgsite
45
45
working_dir : /pkgsite
46
46
searchtest :
47
- image : golang:1.20rc3
47
+ image : golang:1.20
48
48
depends_on :
49
49
- frontend
50
50
environment :
@@ -57,7 +57,7 @@ services:
57
57
- ../../:/pkgsite
58
58
working_dir : /pkgsite
59
59
api :
60
- image : golang:1.20rc3
60
+ image : golang:1.20
61
61
depends_on :
62
62
- frontend
63
63
environment :
@@ -70,7 +70,7 @@ services:
70
70
working_dir : /pkgsite
71
71
frontend :
72
72
# This should match the version we are using on AppEngine.
73
- image : golang:1.20rc3
73
+ image : golang:1.20
74
74
depends_on :
75
75
- db
76
76
command : bash -c "
@@ -89,7 +89,7 @@ services:
89
89
working_dir : /pkgsite
90
90
seeddb :
91
91
# This should match the version we are using on Cloud Run.
92
- image : golang:1.20rc3
92
+ image : golang:1.20
93
93
depends_on :
94
94
- db
95
95
# Note: technically we should check that migrations have completed before
@@ -142,7 +142,7 @@ services:
142
142
shm_size : 8G
143
143
go :
144
144
# This should match the version we are using on Cloud Run.
145
- image : golang:1.20rc3
145
+ image : golang:1.20
146
146
entrypoint : go
147
147
environment :
148
148
<< : *database-variables
You can’t perform that action at this time.
0 commit comments