Skip to content

Commit 9217c4d

Browse files
myitcvmyitcv
committed
ci: update to use go1.17.3 and go1.16.10
Signed-off-by: Paul Jolly <[email protected]> Change-Id: Ib287a441049211361bf95cefd83b1f3ef0fcf150 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/526813 Unity-Result: CUEcueckoo <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
1 parent 437920e commit 9217c4d

File tree

5 files changed

+28
-31
lines changed

5 files changed

+28
-31
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install Go
2020
uses: actions/setup-go@v2
2121
with:
22-
go-version: 1.17.2
22+
go-version: 1.17.3
2323
stable: false
2424
- name: Setup qemu
2525
uses: docker/setup-qemu-action@v1

‎.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
matrix:
3939
go-version:
4040
- 1.15.15
41-
- 1.16.9
42-
- 1.17.2
41+
- 1.16.10
42+
- 1.17.3
4343
os:
4444
- ubuntu-18.04
4545
- macos-10.15
@@ -80,7 +80,7 @@ jobs:
8080
- name: Test
8181
run: go test ./...
8282
- if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ci/')
83-
&& matrix.go-version == '1.17.2' && matrix.os == 'ubuntu-18.04' }}
83+
&& matrix.go-version == '1.17.3' && matrix.os == 'ubuntu-18.04' }}
8484
name: Test with -race
8585
run: go test -race ./...
8686
- name: gorelease check

‎cmd/cue/cmd/testdata/script/cmd_github.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Install Go
9393
uses: actions/setup-go@v2
9494
with:
95-
go-version: 1.17.2
95+
go-version: 1.17.3
9696
stable: false
9797
- name: Setup qemu
9898
uses: docker/setup-qemu-action@v1
@@ -185,8 +185,8 @@ jobs:
185185
matrix:
186186
go-version:
187187
- 1.15.15
188-
- 1.16.9
189-
- 1.17.2
188+
- 1.16.10
189+
- 1.17.3
190190
os:
191191
- ubuntu-18.04
192192
- macos-10.15
@@ -227,7 +227,7 @@ jobs:
227227
- name: Test
228228
run: go test ./...
229229
- if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ci/')
230-
&& matrix.go-version == '1.17.2' && matrix.os == 'ubuntu-18.04' }}
230+
&& matrix.go-version == '1.17.3' && matrix.os == 'ubuntu-18.04' }}
231231
name: Test with -race
232232
run: go test -race ./...
233233
- name: gorelease check
@@ -1372,15 +1372,14 @@ _#step: ((_#job & {
13721372
_#codeGenGo: "1.15.15"
13731373

13741374
// Use a specific latest version for release builds
1375-
_#latestStableGo: "1.17.2"
1375+
_#latestStableGo: "1.17.3"
13761376
_#linuxMachine: "ubuntu-18.04"
13771377
_#macosMachine: "macos-10.15"
13781378
_#windowsMachine: "windows-2019"
13791379
_#testStrategy: {
13801380
"fail-fast": false
13811381
matrix: {
1382-
// Use a stable version of 1.14.x for go generate
1383-
"go-version": [_#codeGenGo, "1.16.9", _#latestStableGo]
1382+
"go-version": [_#codeGenGo, "1.16.10", _#latestStableGo]
13841383
os: [_#linuxMachine, _#macosMachine, _#windowsMachine]
13851384
}
13861385
}

‎cue/testdata/eval/github.txtar

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,14 @@ _#step: ((_#job & {
263263
_#codeGenGo: "1.15.15"
264264

265265
// Use a specific latest version for release builds
266-
_#latestStableGo: "1.17.2"
266+
_#latestStableGo: "1.17.3"
267267
_#linuxMachine: "ubuntu-18.04"
268268
_#macosMachine: "macos-10.15"
269269
_#windowsMachine: "windows-2019"
270270
_#testStrategy: {
271271
"fail-fast": false
272272
matrix: {
273-
// Use a stable version of 1.14.x for go generate
274-
"go-version": [_#codeGenGo, "1.16.9", _#latestStableGo]
273+
"go-version": [_#codeGenGo, "1.16.10", _#latestStableGo]
275274
os: [_#linuxMachine, _#macosMachine, _#windowsMachine]
276275
}
277276
}
@@ -1089,8 +1088,8 @@ import "strings"
10891088
matrix: (#struct){
10901089
"go-version": (#list){
10911090
0: (string){ "1.15.15" }
1092-
1: (string){ "1.16.9" }
1093-
2: (string){ "1.17.2" }
1091+
1: (string){ "1.16.10" }
1092+
2: (string){ "1.17.3" }
10941093
}
10951094
os: (#list){
10961095
0: (string){ "ubuntu-18.04" }
@@ -1144,7 +1143,7 @@ import "strings"
11441143
7: (#struct){
11451144
name: (string){ "Test with -race" }
11461145
run: (string){ "go test -race ./..." }
1147-
if: (string){ "${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ci/') && matrix.go-version == '1.17.2' && matrix.os == 'ubuntu-18.04' }}" }
1146+
if: (string){ "${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ci/') && matrix.go-version == '1.17.3' && matrix.os == 'ubuntu-18.04' }}" }
11481147
}
11491148
8: (#struct){
11501149
name: (string){ "gorelease check" }
@@ -1389,7 +1388,7 @@ import "strings"
13891388
name: (string){ "Install Go" }
13901389
uses: (string){ "actions/setup-go@v2" }
13911390
with: (#struct){
1392-
"go-version": (string){ "1.17.2" }
1391+
"go-version": (string){ "1.17.3" }
13931392
stable: (bool){ false }
13941393
}
13951394
}
@@ -1670,8 +1669,8 @@ import "strings"
16701669
matrix: (#struct){
16711670
"go-version": (#list){
16721671
0: (string){ "1.15.15" }
1673-
1: (string){ "1.16.9" }
1674-
2: (string){ "1.17.2" }
1672+
1: (string){ "1.16.10" }
1673+
2: (string){ "1.17.3" }
16751674
}
16761675
os: (#list){
16771676
0: (string){ "ubuntu-18.04" }
@@ -1725,7 +1724,7 @@ import "strings"
17251724
7: (#struct){
17261725
name: (string){ "Test with -race" }
17271726
run: (string){ "go test -race ./..." }
1728-
if: (string){ "${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ci/') && matrix.go-version == '1.17.2' && matrix.os == 'ubuntu-18.04' }}" }
1727+
if: (string){ "${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ci/') && matrix.go-version == '1.17.3' && matrix.os == 'ubuntu-18.04' }}" }
17291728
}
17301729
8: (#struct){
17311730
name: (string){ "gorelease check" }
@@ -1964,7 +1963,7 @@ import "strings"
19641963
name: (string){ "Install Go" }
19651964
uses: (string){ "actions/setup-go@v2" }
19661965
with: (#struct){
1967-
"go-version": (string){ "1.17.2" }
1966+
"go-version": (string){ "1.17.3" }
19681967
stable: (bool){ false }
19691968
}
19701969
}
@@ -2238,7 +2237,7 @@ import "strings"
22382237
_#step(:ci): (#struct){
22392238
}
22402239
_#codeGenGo(:ci): (string){ "1.15.15" }
2241-
_#latestStableGo(:ci): (string){ "1.17.2" }
2240+
_#latestStableGo(:ci): (string){ "1.17.3" }
22422241
_#linuxMachine(:ci): (string){ "ubuntu-18.04" }
22432242
_#macosMachine(:ci): (string){ "macos-10.15" }
22442243
_#windowsMachine(:ci): (string){ "windows-2019" }
@@ -2247,8 +2246,8 @@ import "strings"
22472246
matrix: (#struct){
22482247
"go-version": (#list){
22492248
0: (string){ "1.15.15" }
2250-
1: (string){ "1.16.9" }
2251-
2: (string){ "1.17.2" }
2249+
1: (string){ "1.16.10" }
2250+
2: (string){ "1.17.3" }
22522251
}
22532252
os: (#list){
22542253
0: (string){ "ubuntu-18.04" }
@@ -2262,7 +2261,7 @@ import "strings"
22622261
name: (string){ "Set go build tags" }
22632262
run: (_|_){
22642263
// [incomplete] _#setGoBuildTags.run: invalid interpolation: non-concrete value string (type string):
2265-
// ./workflows.cue:273:10
2264+
// ./workflows.cue:272:10
22662265
}
22672266
}
22682267
_#installGo(:ci): (#struct){
@@ -2643,7 +2642,7 @@ import "strings"
26432642
_,
26442643
])[0]
26452644
_#codeGenGo: "1.15.15"
2646-
_#latestStableGo: "1.17.2"
2645+
_#latestStableGo: "1.17.3"
26472646
_#linuxMachine: "ubuntu-18.04"
26482647
_#macosMachine: "macos-10.15"
26492648
_#windowsMachine: "windows-2019"
@@ -2652,7 +2651,7 @@ import "strings"
26522651
matrix: {
26532652
"go-version": [
26542653
〈2;_#codeGenGo〉,
2655-
"1.16.9",
2654+
"1.16.10",
26562655
〈2;_#latestStableGo〉,
26572656
]
26582657
os: [

‎internal/ci/workflows.cue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ _#step: ((_#job & {steps: _}).steps & [_])[0]
347347
_#codeGenGo: "1.15.15"
348348

349349
// Use a specific latest version for release builds
350-
_#latestStableGo: "1.17.2"
350+
_#latestStableGo: "1.17.3"
351351

352352
_#linuxMachine: "ubuntu-18.04"
353353
_#macosMachine: "macos-10.15"
@@ -356,8 +356,7 @@ _#windowsMachine: "windows-2019"
356356
_#testStrategy: {
357357
"fail-fast": false
358358
matrix: {
359-
// Use a stable version of 1.14.x for go generate
360-
"go-version": [_#codeGenGo, "1.16.9", _#latestStableGo]
359+
"go-version": [_#codeGenGo, "1.16.10", _#latestStableGo]
361360
os: [_#linuxMachine, _#macosMachine, _#windowsMachine]
362361
}
363362
}

0 commit comments

Comments
 (0)