Skip to content

Commit e45054d

Browse files
mikeeemikeee
authored
introduces go1.22 to tests (and misc cleanup) (#504)
* introduces go1.22 - dapr-bot updated to use go1.22 - adds go1.22 to the test jobs - adds go1.22 to tooling tests Signed-off-by: mikeee <[email protected]> * remove 1.20 tests Signed-off-by: mikeee <[email protected]> * dapr-bot workflow changes - retrieve go version from go.mod - run go mod tidy rather than go get Signed-off-by: mikeee <[email protected]> * bump action versions and release go version is now from go.mod Signed-off-by: mikeee <[email protected]> * bump main and tool mod files to 1.21 Signed-off-by: mikeee <[email protected]> * fix dapr-bot test Signed-off-by: mikeee <[email protected]> * test dapr-bot using go version from go.mod Signed-off-by: mikeee <[email protected]> * bump action versions and remove explicit caching Signed-off-by: mikeee <[email protected]> * bump examples to go1.21 and bump deps Signed-off-by: mikeee <[email protected]> * bump compatibility check to 1.21 in the make flow Signed-off-by: mikeee <[email protected]> * bump to dapr1.13rc2 Signed-off-by: mikeee <[email protected]> * tidy sums Signed-off-by: mikeee <[email protected]> * empty commit to trigger tests (flaky example service validation) Signed-off-by: mikeee <[email protected]> * remove conditionals for modtidy/checkdiff runs Signed-off-by: mikeee <[email protected]> --------- Signed-off-by: mikeee <[email protected]>
1 parent cefbadb commit e45054d

File tree

27 files changed

+453
-215
lines changed

27 files changed

+453
-215
lines changed

‎.github/workflows/dapr-bot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
- name: Setup Golang
2222
uses: actions/setup-go@v4
2323
with:
24-
go-version: ~1.20
24+
go-version-file: "./.github/workflows/dapr-bot/go.mod"
2525
cache-dependency-path: |
2626
./.github/workflows/dapr-bot/
2727
2828
- name: go-bot-mod
2929
working-directory: ./.github/workflows/dapr-bot/
30-
run: go get ./...
31-
- name: go-bot-run
30+
run: go mod tidy
3231

32+
- name: go-bot-run
3333
working-directory: ./.github/workflows/dapr-bot/
3434
run: go run .

‎.github/workflows/dapr-bot/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GO_COMPAT_VERSION=1.20
1+
GO_COMPAT_VERSION=1.22
22

33
.PHONY: cover
44
cover:
@@ -14,4 +14,4 @@ test:
1414
-race \
1515
-coverprofile=coverage.txt \
1616
-covermode=atomic \
17-
./...
17+
./...

‎.github/workflows/dapr-bot/go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/dapr/go-sdk/.github/workflows/dapr-bot
22

3-
go 1.20
3+
go 1.22
4+
5+
toolchain go1.22.0
46

57
require (
68
github.com/google/go-github/v55 v55.0.0
@@ -9,12 +11,12 @@ require (
911
)
1012

1113
require (
12-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
13-
github.com/cloudflare/circl v1.3.3 // indirect
14+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
15+
github.com/cloudflare/circl v1.3.7 // indirect
1416
github.com/davecgh/go-spew v1.1.1 // indirect
1517
github.com/google/go-querystring v1.1.0 // indirect
1618
github.com/pmezard/go-difflib v1.0.0 // indirect
17-
golang.org/x/crypto v0.12.0 // indirect
18-
golang.org/x/sys v0.11.0 // indirect
19+
golang.org/x/crypto v0.18.0 // indirect
20+
golang.org/x/sys v0.16.0 // indirect
1921
gopkg.in/yaml.v3 v3.0.1 // indirect
2022
)

‎.github/workflows/dapr-bot/go.sum

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA=
2-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
3-
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
4-
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
5-
github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
1+
github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
2+
github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
3+
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
64
github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
5+
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
6+
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
77
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1010
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
11+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1112
github.com/google/go-github/v55 v55.0.0 h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg=
1213
github.com/google/go-github/v55 v55.0.0/go.mod h1:JLahOTA1DnXzhxEymmFF5PP2tSS9JVNj68mSZNDwskA=
1314
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -18,18 +19,51 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1819
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1920
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
2021
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
22+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
23+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
2124
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
22-
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
23-
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
25+
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
26+
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
27+
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
28+
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
29+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
30+
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
31+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
2432
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
33+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
34+
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
35+
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
36+
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
37+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
38+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
39+
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
40+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2541
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2642
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
27-
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
28-
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
29-
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
43+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
44+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
45+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
46+
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
47+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
48+
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
50+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3051
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
52+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
53+
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
54+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
55+
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
56+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3157
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
58+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
59+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
60+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
61+
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
3262
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
63+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
64+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
65+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
66+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3367
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3468
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
3569
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: "Run FOSSA Scan"
3838
uses: fossas/[email protected] # Use a specific version if locking is preferred

‎.github/workflows/release-on-tag.yaml

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,57 @@ name: Release
33
on:
44
push:
55
tags:
6-
- 'v*' # v0.8.1
6+
- "v*" # v0.8.1
77

88
jobs:
9-
109
build:
1110
name: Create Release on Tag
1211
runs-on: ubuntu-latest
1312
steps:
14-
15-
- name: Setup
16-
uses: actions/setup-go@v3
17-
with:
18-
go-version: ^1.20
19-
20-
- name: Checkout
21-
uses: actions/checkout@v3
22-
23-
- name: Check sdk-version file
24-
run: |
25-
SDK_VERSION="$(head -n1 version/sdk-version)"
26-
SDK_VERSION_GIT="refs/tags/${SDK_VERSION}"
27-
if [[ "${SDK_VERSION_GIT}" != "${{ github.ref }}" ]]; then
28-
echo "File version/sdk-version (${SDK_VERSION}) needs to be updated to ${{ github.ref }}"
29-
exit 1
30-
fi
31-
shell: bash
32-
33-
- name: Tidy
34-
run: make tidy
35-
36-
- name: Test
37-
run: make test
38-
39-
- name: Version
40-
run: |
41-
echo "RELEASE_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
42-
43-
- name: Release
44-
uses: actions/create-release@v1
45-
env:
46-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47-
with:
48-
tag_name: ${{ github.ref }}
49-
release_name: Release ${{ github.ref }}
50-
body: Automatic Go Dapr client release
51-
draft: false
52-
prerelease: false
53-
54-
- name: Notify
55-
uses: rjstone/discord-webhook-notify@v1
56-
with:
57-
severity: info
58-
details: Release ${{ github.ref }} published
59-
description: Release
60-
webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
61-
avatarUrl: https://github.githubassets.com/images/modules/logos_page/Octocat.png
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
16+
- name: Setup
17+
uses: actions/setup-go@v5
18+
with:
19+
go-version-file: "go.mod"
20+
21+
- name: Check sdk-version file
22+
run: |
23+
SDK_VERSION="$(head -n1 version/sdk-version)"
24+
SDK_VERSION_GIT="refs/tags/${SDK_VERSION}"
25+
if [[ "${SDK_VERSION_GIT}" != "${{ github.ref }}" ]]; then
26+
echo "File version/sdk-version (${SDK_VERSION}) needs to be updated to ${{ github.ref }}"
27+
exit 1
28+
fi
29+
shell: bash
30+
31+
- name: Tidy
32+
run: make tidy
33+
34+
- name: Test
35+
run: make test
36+
37+
- name: Version
38+
run: |
39+
echo "RELEASE_VERSION=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
40+
41+
- name: Release
42+
uses: actions/create-release@v1
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
with:
46+
tag_name: ${{ github.ref }}
47+
release_name: Release ${{ github.ref }}
48+
body: Automatic Go Dapr client release
49+
draft: false
50+
prerelease: false
51+
52+
- name: Notify
53+
uses: rjstone/discord-webhook-notify@v1
54+
with:
55+
severity: info
56+
details: Release ${{ github.ref }} published
57+
description: Release
58+
webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
59+
avatarUrl: https://github.githubassets.com/images/modules/logos_page/Octocat.png

‎.github/workflows/test-dapr-bot.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,21 @@ on:
1414

1515
jobs:
1616
build:
17-
name: Test on ${{ matrix.gover }}
17+
name: Test
1818
runs-on: ubuntu-latest
19-
strategy:
20-
fail-fast: false
21-
matrix:
22-
gover:
23-
- "1.20"
2419
env:
2520
GOVER: ${{ matrix.gover }}
2621
GOLANGCILINT_VER: v1.55.2
2722

2823
steps:
29-
- name: Setup
30-
uses: actions/setup-go@v4
31-
with:
32-
go-version: ${{ env.GOVER }}
33-
3424
- name: Checkout
3525
uses: actions/checkout@v4
3626

27+
- name: Setup
28+
uses: actions/setup-go@v5
29+
with:
30+
go-version-file: ./.github/workflows/dapr-bot/go.mod
31+
3732
- name: Tidy
3833
working-directory: ./.github/workflows/dapr-bot
3934
run: make tidy

‎.github/workflows/test-on-push.yaml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,19 @@ jobs:
1515
matrix:
1616
gover:
1717
- "1.21"
18-
- "1.20"
18+
- "1.22"
1919
env:
2020
GOVER: ${{ matrix.gover }}
2121
GOLANGCILINT_VER: v1.55.2
2222

2323
steps:
24-
- name: Setup
25-
uses: actions/setup-go@v3
26-
with:
27-
go-version: ${{ env.GOVER }}
28-
2924
- name: Checkout
30-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
3126

32-
- name: Cache
33-
uses: actions/cache@v3
27+
- name: Setup
28+
uses: actions/setup-go@v5
3429
with:
35-
path: ~/go/pkg/mod
36-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
37-
restore-keys: |
38-
${{ runner.os }}-go-
30+
go-version: ${{ env.GOVER }}
3931

4032
- name: Tidy
4133
run: make tidy
@@ -44,7 +36,7 @@ jobs:
4436
run: make test
4537

4638
- name: Cover
47-
uses: codecov/codecov-action@v3
39+
uses: codecov/codecov-action@v4
4840

4941
- name: Lint
5042
uses: golangci/[email protected]
@@ -54,8 +46,6 @@ jobs:
5446
args: --timeout=10m0s
5547

5648
- name: Run go mod tidy check diff
57-
if: strategy.job-index == 0
5849
run: make modtidy check-diff
5950
- name: Run go mod tidy
60-
if: strategy.job-index != 0
6151
run: make modtidy

‎.github/workflows/test-tooling.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ on:
1515
jobs:
1616
build:
1717
name: Test (${{ matrix.os}}) go ${{ matrix.gover }}
18-
18+
1919
strategy:
2020
fail-fast: false
2121
matrix:
2222
gover:
23-
- "1.20"
24-
os:
23+
- "1.21"
24+
- "1.22"
25+
os:
2526
- "ubuntu-latest"
2627
- "windows-latest"
2728
- "macos-latest"
@@ -31,14 +32,14 @@ jobs:
3132
GOLANGCILINT_VER: v1.55.2 # Make sure to bump /tools/check-lint-version/main_test.go
3233

3334
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v4
37+
3438
- name: Setup
35-
uses: actions/setup-go@v4
39+
uses: actions/setup-go@v5
3640
with:
3741
go-version: ${{ env.GOVER }}
3842

39-
- name: Checkout
40-
uses: actions/checkout@v4
41-
4243
- name: Tidy
4344
working-directory: ./tools/check-lint-version
4445
run: make tidy
@@ -52,8 +53,8 @@ jobs:
5253
args: --timeout=10m0s --config ../../.golangci.yml
5354

5455
- name: Install Linter
55-
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)/bin" ${{ env.GOLANGCILINT_VER }}
56+
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)/bin" ${{ env.GOLANGCILINT_VER }}
5657

5758
- name: Test
5859
working-directory: ./tools/check-lint-version
59-
run: make test
60+
run: make test

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RELEASE_VERSION =v1.0.0-rc-3
22
GDOC_PORT =8888
3-
GO_COMPAT_VERSION=1.20
3+
GO_COMPAT_VERSION=1.21
44

55
.PHONY: all
66
all: help

0 commit comments

Comments
 (0)