Skip to content

Commit ecdbccd

Browse files
mvdancueckoo
mvdan
authored and
cueckoo
committed
internal/ci: update to the latest base module
Signed-off-by: Daniel Martí <[email protected]> Change-Id: Ia0e242fcfceb70c411a69cfa3f7a6a26d68b0ac2 Dispatch-Trailer: {"type":"trybot","CL":1219850,"patchset":2,"ref":"refs/changes/50/1219850/2","targetBranch":"master"}
1 parent 71b9966 commit ecdbccd

File tree

8 files changed

+50
-42
lines changed

8 files changed

+50
-42
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+
- master
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-lang/contrib-tools'}}
1116
steps:
1217
- name: Write netrc file for cueckoo 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-
- master

‎.github/workflows/trybot.yaml

Lines changed: 7 additions & 6 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-lang/contrib-tools' && (((github.ref == 'refs/heads/master') && (! (contains(github.event.head_commit.message, '
8180
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test'))
@@ -90,10 +89,12 @@ jobs:
9089
run: go test ./...
9190
- name: Race test
9291
run: go test -race ./...
93-
- name: staticcheck
94-
run: go run honnef.co/go/tools/cmd/[email protected] ./...
95-
- name: Tidy
96-
run: go mod tidy
92+
- env:
93+
STATICCHECK_CACHE: /cache/staticcheck
94+
run: go tool staticcheck ./...
95+
- run: |-
96+
go mod tidy -diff
97+
go vet ./...
9798
- if: always()
9899
name: Check that git is clean at the end of the job
99100
run: test -z "$(git status --porcelain)" || (git status; git diff; false)

‎.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') && true) || github.event.client_payload.type == 'trybot' }}
1616
steps:
1717
- name: Write netrc file for cueckoo Gerrithub

‎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.1"
11+
v: "v0.0.8"
1212
default: true
1313
}
1414
}

‎go.mod

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
module github.com/cue-lang/contrib-tools
22

3-
go 1.20
3+
go 1.23
44

55
require (
66
github.com/andygrunwald/go-gerrit v0.0.0-20230628115649-c44fe2fbf2ca
7-
github.com/google/go-cmp v0.5.9
7+
github.com/google/go-cmp v0.6.0
88
github.com/google/go-github/v53 v53.2.0
99
github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466
1010
github.com/spf13/cobra v1.7.0
1111
golang.org/x/oauth2 v0.10.0
12-
golang.org/x/sync v0.3.0
12+
golang.org/x/sync v0.11.0
1313
)
1414

1515
require (
16+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
1617
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
1718
github.com/cloudflare/circl v1.3.3 // indirect
1819
github.com/golang/protobuf v1.5.3 // indirect
1920
github.com/google/go-querystring v1.1.0 // indirect
2021
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2122
github.com/spf13/pflag v1.0.5 // indirect
22-
golang.org/x/crypto v0.11.0 // indirect
23-
golang.org/x/net v0.13.0 // indirect
24-
golang.org/x/sys v0.10.0 // indirect
23+
golang.org/x/crypto v0.33.0 // indirect
24+
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
25+
golang.org/x/mod v0.23.0 // indirect
26+
golang.org/x/net v0.35.0 // indirect
27+
golang.org/x/sys v0.30.0 // indirect
28+
golang.org/x/tools v0.30.0 // indirect
2529
google.golang.org/appengine v1.6.7 // indirect
2630
google.golang.org/protobuf v1.31.0 // indirect
31+
honnef.co/go/tools v0.6.1 // indirect
2732
)
33+
34+
tool honnef.co/go/tools/cmd/staticcheck

‎go.sum

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs=
2+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
13
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs=
24
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
35
github.com/andygrunwald/go-gerrit v0.0.0-20230628115649-c44fe2fbf2ca h1:q9HI3vudtbNNvaZl+l0oM7cQ07OES2x7ysiVwZpk89E=
@@ -12,8 +14,8 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
1214
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
1315
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1416
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
15-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
16-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
17+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
18+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1719
github.com/google/go-github/v53 v53.2.0 h1:wvz3FyF53v4BK+AsnvCmeNhf8AkTaeh2SoYu/XUvTtI=
1820
github.com/google/go-github/v53 v53.2.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
1921
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -32,26 +34,30 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
3234
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
3335
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
3436
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
35-
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
36-
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
37+
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
38+
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
39+
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
40+
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
3741
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
3842
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
43+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
44+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
3945
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
4046
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4147
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
4248
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
4349
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
4450
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
4551
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
46-
golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
47-
golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
52+
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
53+
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
4854
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
4955
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
5056
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5157
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5258
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
53-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
54-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
59+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
60+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
5561
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5662
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5763
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -61,8 +67,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6167
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6268
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6369
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
64-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
65-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
70+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
71+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
6672
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
6773
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
6874
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -79,6 +85,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
7985
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
8086
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
8187
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
88+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
89+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
8290
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8391
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8492
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -89,3 +97,5 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs
8997
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
9098
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9199
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
100+
honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI=
101+
honnef.co/go/tools v0.6.1/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=

‎internal/ci/github/trybot.cue

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020

2121
// The trybot workflow.
2222
workflows: trybot: _repo.bashWorkflow & {
23-
name: _repo.trybot.name
24-
2523
on: {
2624
push: {
2725
branches: list.Concat([[_repo.testDefaultBranch], _repo.protectedBranchPatterns]) // do not run PR branches
@@ -66,14 +64,8 @@ workflows: trybot: _repo.bashWorkflow & {
6664
name: "Race test"
6765
run: "go test -race ./..."
6866
},
69-
{
70-
name: "staticcheck"
71-
run: "go run honnef.co/go/tools/cmd/[email protected] ./..."
72-
},
73-
{
74-
name: "Tidy"
75-
run: "go mod tidy"
76-
},
67+
_repo.staticcheck,
68+
_repo.goChecks,
7769
_repo.checkGitClean,
7870
]
7971
}

‎internal/ci/repo/repo.cue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,3 @@ githubRepositoryPath: "cue-lang/contrib-tools"
1313

1414
botGitHubUser: "cueckoo"
1515
botGitHubUserEmail: "[email protected]"
16-
17-
latestGo: "1.24.x"

0 commit comments

Comments
 (0)