Skip to content

Commit 30d7026

Browse files
mvdanporcuepine
mvdan
authored and
porcuepine
committed
internal/ci: update to the latest base version
And switch to `go tool staticcheck` like the other repos. Signed-off-by: Daniel Martí <[email protected]> Change-Id: Ia5615e58fd0411af41e386b2b7d6316e41ec18e5 Dispatch-Trailer: {"type":"trybot","CL":1219934,"patchset":2,"ref":"refs/changes/34/1219934/2","targetBranch":"main"}
1 parent 074d060 commit 30d7026

File tree

15 files changed

+126
-138
lines changed

15 files changed

+126
-138
lines changed

‎.github/workflows/push_tip_to_trybot.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
# Code generated internal/ci/ci_tool.cue; DO NOT EDIT.
22

3+
name: Push tip to trybot
4+
"on":
5+
push:
6+
branches:
7+
- main
38
concurrency: push_tip_to_trybot
49
jobs:
510
push:
611
defaults:
712
run:
813
shell: bash --noprofile --norc -euo pipefail {0}
9-
runs-on: ns-linux-amd64
14+
runs-on: namespace-profile-linux-amd64;overrides.cache-tag=cue-dispatch-workflow
1015
if: ${{github.repository == 'cue-labs/oci'}}
1116
steps:
1217
- name: Write netrc file for porcuepine Gerrithub
@@ -43,8 +48,3 @@ jobs:
4348
echo "Giving up"
4449
exit 1
4550
fi
46-
name: Push tip to trybot
47-
"on":
48-
push:
49-
branches:
50-
- main

‎.github/workflows/trybot.yaml‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
defaults:
1616
run:
1717
shell: bash --noprofile --norc -euo pipefail {0}
18-
runs-on: ns-linux-amd64
18+
runs-on: namespace-profile-linux-amd64
1919
if: |-
2020
(contains(github.event.head_commit.message, '
2121
Dispatch-Trailer: {"type":"trybot"')) || ! (contains(github.event.head_commit.message, '
@@ -75,7 +75,6 @@ jobs:
7575
uses: namespacelabs/nscloud-cache-action@v1
7676
with:
7777
cache: go
78-
path: ${{ runner.temp }}/staticcheck
7978
- if: |-
8079
github.repository == 'cue-labs/oci' && (((github.ref == 'refs/heads/main') && (! (contains(github.event.head_commit.message, '
8180
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test'))
@@ -94,16 +93,16 @@ jobs:
9493
GOWORK: ""
9594
- working-directory: cmd/ocisrv
9695
name: Check cmd/ocisrv
97-
run: go vet ./...
96+
run: |-
97+
go mod tidy -diff
98+
go vet ./...
9899
env:
99100
GOWORK: ""
100101
- name: Staticcheck cmd/ocisrv
101-
uses: dominikh/staticcheck-action@v1
102-
with:
103-
version: 2025.1.1
104-
install-go: false
105-
use-cache: false
106-
working-directory: cmd/ocisrv
102+
working-directory: cmd/ocisrv
103+
env:
104+
STATICCHECK_CACHE: /cache/staticcheck
105+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
107106
- working-directory: cmd/ocisrv
108107
name: Generate cmd/ocisrv with GOWORK=off
109108
run: go generate ./...
@@ -116,16 +115,16 @@ jobs:
116115
GOWORK: "off"
117116
- working-directory: cmd/ocisrv
118117
name: Check cmd/ocisrv with GOWORK=off
119-
run: go vet ./...
118+
run: |-
119+
go mod tidy -diff
120+
go vet ./...
120121
env:
121122
GOWORK: "off"
122123
- name: Staticcheck cmd/ocisrv with GOWORK=off
123-
uses: dominikh/staticcheck-action@v1
124-
with:
125-
version: 2025.1.1
126-
install-go: false
127-
use-cache: false
128-
working-directory: cmd/ocisrv
124+
working-directory: cmd/ocisrv
125+
env:
126+
STATICCHECK_CACHE: /cache/staticcheck
127+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
129128
- working-directory: ociregistry/internal/conformance
130129
name: Generate ociregistry/internal/conformance
131130
run: go generate ./...
@@ -138,16 +137,16 @@ jobs:
138137
GOWORK: ""
139138
- working-directory: ociregistry/internal/conformance
140139
name: Check ociregistry/internal/conformance
141-
run: go vet ./...
140+
run: |-
141+
go mod tidy -diff
142+
go vet ./...
142143
env:
143144
GOWORK: ""
144145
- name: Staticcheck ociregistry/internal/conformance
145-
uses: dominikh/staticcheck-action@v1
146-
with:
147-
version: 2025.1.1
148-
install-go: false
149-
use-cache: false
150-
working-directory: ociregistry/internal/conformance
146+
working-directory: ociregistry/internal/conformance
147+
env:
148+
STATICCHECK_CACHE: /cache/staticcheck
149+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
151150
- working-directory: ociregistry/internal/conformance
152151
name: Generate ociregistry/internal/conformance with GOWORK=off
153152
run: go generate ./...
@@ -160,16 +159,16 @@ jobs:
160159
GOWORK: "off"
161160
- working-directory: ociregistry/internal/conformance
162161
name: Check ociregistry/internal/conformance with GOWORK=off
163-
run: go vet ./...
162+
run: |-
163+
go mod tidy -diff
164+
go vet ./...
164165
env:
165166
GOWORK: "off"
166167
- name: Staticcheck ociregistry/internal/conformance with GOWORK=off
167-
uses: dominikh/staticcheck-action@v1
168-
with:
169-
version: 2025.1.1
170-
install-go: false
171-
use-cache: false
172-
working-directory: ociregistry/internal/conformance
168+
working-directory: ociregistry/internal/conformance
169+
env:
170+
STATICCHECK_CACHE: /cache/staticcheck
171+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
173172
- working-directory: ociregistry
174173
name: Generate ociregistry
175174
run: go generate ./...
@@ -182,16 +181,16 @@ jobs:
182181
GOWORK: ""
183182
- working-directory: ociregistry
184183
name: Check ociregistry
185-
run: go vet ./...
184+
run: |-
185+
go mod tidy -diff
186+
go vet ./...
186187
env:
187188
GOWORK: ""
188189
- name: Staticcheck ociregistry
189-
uses: dominikh/staticcheck-action@v1
190-
with:
191-
version: 2025.1.1
192-
install-go: false
193-
use-cache: false
194-
working-directory: ociregistry
190+
working-directory: ociregistry
191+
env:
192+
STATICCHECK_CACHE: /cache/staticcheck
193+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
195194
- working-directory: ociregistry
196195
name: Generate ociregistry with GOWORK=off
197196
run: go generate ./...
@@ -204,16 +203,16 @@ jobs:
204203
GOWORK: "off"
205204
- working-directory: ociregistry
206205
name: Check ociregistry with GOWORK=off
207-
run: go vet ./...
206+
run: |-
207+
go mod tidy -diff
208+
go vet ./...
208209
env:
209210
GOWORK: "off"
210211
- name: Staticcheck ociregistry with GOWORK=off
211-
uses: dominikh/staticcheck-action@v1
212-
with:
213-
version: 2025.1.1
214-
install-go: false
215-
use-cache: false
216-
working-directory: ociregistry
212+
working-directory: ociregistry
213+
env:
214+
STATICCHECK_CACHE: /cache/staticcheck
215+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
217216
- working-directory: internal/ci
218217
name: Generate internal/ci
219218
run: go generate ./...
@@ -226,16 +225,16 @@ jobs:
226225
GOWORK: ""
227226
- working-directory: internal/ci
228227
name: Check internal/ci
229-
run: go vet ./...
228+
run: |-
229+
go mod tidy -diff
230+
go vet ./...
230231
env:
231232
GOWORK: ""
232233
- name: Staticcheck internal/ci
233-
uses: dominikh/staticcheck-action@v1
234-
with:
235-
version: 2025.1.1
236-
install-go: false
237-
use-cache: false
238-
working-directory: internal/ci
234+
working-directory: internal/ci
235+
env:
236+
STATICCHECK_CACHE: /cache/staticcheck
237+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
239238
- working-directory: internal/ci
240239
name: Generate internal/ci with GOWORK=off
241240
run: go generate ./...
@@ -248,16 +247,16 @@ jobs:
248247
GOWORK: "off"
249248
- working-directory: internal/ci
250249
name: Check internal/ci with GOWORK=off
251-
run: go vet ./...
250+
run: |-
251+
go mod tidy -diff
252+
go vet ./...
252253
env:
253254
GOWORK: "off"
254255
- name: Staticcheck internal/ci with GOWORK=off
255-
uses: dominikh/staticcheck-action@v1
256-
with:
257-
version: 2025.1.1
258-
install-go: false
259-
use-cache: false
260-
working-directory: internal/ci
256+
working-directory: internal/ci
257+
env:
258+
STATICCHECK_CACHE: /cache/staticcheck
259+
run: go tool -modfile=${{ github.workspace }}/internal/ci/go.mod staticcheck ./...
261260
- run: go work sync
262261
- if: always()
263262
name: Check that git is clean at the end of the job

‎.github/workflows/trybot_dispatch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
defaults:
1212
run:
1313
shell: bash --noprofile --norc -euo pipefail {0}
14-
runs-on: ns-linux-amd64
14+
runs-on: namespace-profile-linux-amd64;overrides.cache-tag=cue-dispatch-workflow
1515
if: ${{ ((github.ref == 'refs/heads/ci/test') && false) || github.event.client_payload.type == 'trybot' }}
1616
steps:
1717
- name: Write netrc file for porcuepine Gerrithub

‎cmd/ocisrv/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ require (
2020
github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
2121
github.com/opencontainers/image-spec v1.1.1 // indirect
2222
github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 // indirect
23-
golang.org/x/mod v0.21.0 // indirect
24-
golang.org/x/net v0.33.0 // indirect
25-
golang.org/x/sys v0.28.0 // indirect
26-
golang.org/x/text v0.21.0 // indirect
27-
golang.org/x/tools v0.26.0 // indirect
23+
golang.org/x/mod v0.23.0 // indirect
24+
golang.org/x/net v0.35.0 // indirect
25+
golang.org/x/sys v0.30.0 // indirect
26+
golang.org/x/text v0.22.0 // indirect
27+
golang.org/x/tools v0.30.0 // indirect
2828
gopkg.in/yaml.v3 v3.0.1 // indirect
2929
)

‎cmd/ocisrv/go.sum‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,12 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
4040
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
4141
github.com/rogpeppe/retry v0.1.0 h1:6km4oqeZcFrnhx+PCPg/YxV3fnTdROBNVlSl8Pe/ztU=
4242
github.com/rogpeppe/retry v0.1.0/go.mod h1:/PtRtl9qXn+Pv5S4wN+Y5nusihQeI1PJ9U7KDcKzuvI=
43-
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
44-
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
45-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
46-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
47-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
48-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
49-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
50-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
51-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
52-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
53-
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
54-
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
43+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
44+
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
45+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
46+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
47+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
48+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
5549
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5650
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
5751
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎go.work.sum‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
7777
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
7878
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
7979
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
80+
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
8081
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
8182
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
8283
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -88,14 +89,13 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
8889
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
8990
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
9091
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
92+
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
9193
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9294
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9395
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9496
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9597
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9698
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
97-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
98-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
9999
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
100100
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
101101
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -107,6 +107,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
107107
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
108108
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
109109
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
110+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
110111
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
111112
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
112113
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
@@ -115,9 +116,11 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
115116
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
116117
golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
117118
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
119+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
118120
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
119121
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
120122
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
123+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
121124
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
122125
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
123126
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

‎internal/ci/cue.mod/module.cue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ deps: {
88
default: true
99
}
1010
"github.com/cue-lang/tmp/internal/ci@v0": {
11-
v: "v0.0.3"
11+
v: "v0.0.8"
1212
default: true
1313
}
1414
}

0 commit comments

Comments
 (0)