Skip to content

Commit 3a101ba

Browse files
committed
all: add Go 1.21, drop Go 1.19
Per our Go support policy accepted in https://cuelang.org/issue/1937, the upcoming CUE v0.7 release will require Go 1.20 or later. Note that the files generated by gocode contain slightly smaller data, which is due to a minor non-breaking change in encoding/gob in Go 1.21. For more information, see https://cuelang.org/cl/1167483. Signed-off-by: Daniel Martí <[email protected]> Change-Id: I63dc3d443feedf899b632320cce8060b925accec Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1167484 Reviewed-by: Paul Jolly <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Unity-Result: CUE porcuepine <[email protected]>
1 parent 72ba066 commit 3a101ba

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
uses: actions/setup-go@v4
6767
with:
6868
cache: false
69-
go-version: 1.20.6
69+
go-version: 1.21.0
7070
- name: Setup qemu
7171
uses: docker/setup-qemu-action@v2
7272
- name: Set up Docker Buildx

.github/workflows/trybot.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
go-version:
20-
- 1.19.x
2120
- 1.20.x
21+
- 1.21.x
2222
runner:
2323
- ubuntu-22.04
2424
- macos-11
@@ -110,7 +110,7 @@ jobs:
110110
github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
111111
Dispatch-Trailer: {"type":"')))) || github.ref == 'refs/heads/ci/test')
112112
run: go clean -testcache
113-
- if: (matrix.go-version == '1.20.x' && matrix.runner == 'ubuntu-22.04')
113+
- if: (matrix.go-version == '1.21.x' && matrix.runner == 'ubuntu-22.04')
114114
name: Early git and code sanity checks
115115
run: |-
116116
# Ensure the recent commit messages have Signed-off-by headers. We
@@ -167,20 +167,20 @@ jobs:
167167
fi
168168
- if: |-
169169
((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
170-
Dispatch-Trailer: {"type":"')))) || (matrix.go-version == '1.20.x' && matrix.runner == 'ubuntu-22.04')
170+
Dispatch-Trailer: {"type":"')))) || (matrix.go-version == '1.21.x' && matrix.runner == 'ubuntu-22.04')
171171
run: echo CUE_LONG=true >> $GITHUB_ENV
172-
- if: (matrix.go-version == '1.20.x' && matrix.runner == 'ubuntu-22.04')
172+
- if: (matrix.go-version == '1.21.x' && matrix.runner == 'ubuntu-22.04')
173173
name: Generate
174174
run: go generate ./...
175175
- if: |-
176176
((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
177-
Dispatch-Trailer: {"type":"')))) || !(matrix.go-version == '1.20.x' && matrix.runner == 'ubuntu-22.04')
177+
Dispatch-Trailer: {"type":"')))) || !(matrix.go-version == '1.21.x' && matrix.runner == 'ubuntu-22.04')
178178
name: Test
179179
run: go test ./...
180-
- if: (matrix.go-version == '1.20.x' && matrix.runner == 'ubuntu-22.04')
180+
- if: (matrix.go-version == '1.21.x' && matrix.runner == 'ubuntu-22.04')
181181
name: Test with -race
182182
run: go test -race ./...
183-
- if: (matrix.go-version == '1.20.x' && matrix.runner == 'ubuntu-22.04')
183+
- if: (matrix.go-version == '1.21.x' && matrix.runner == 'ubuntu-22.04')
184184
name: Check
185185
run: go vet ./...
186186
- name: Check that git is clean at the end of the job

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ href="mailto:[email protected]">[email protected]</a>.
114114
The code contribution process used by the CUE project is a little different from
115115
that used by other open source projects. We assume you have a basic
116116
understanding of [`git`](https://git-scm.com/) and [Go](https://golang.org)
117-
(1.19 or later).
117+
(1.20 or later).
118118

119119
The first thing to decide is whether you want to contribute a code change via
120120
GitHub or GerritHub. Both workflows are fully supported, and whilst GerritHub is

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
[![Go Reference](https://pkg.go.dev/badge/cuelang.org/go.svg)](https://pkg.go.dev/cuelang.org/go)
1717
[![Github](https://github.com/cue-lang/cue/actions/workflows/trybot.yml/badge.svg)](https://github.com/cue-lang/cue/actions/workflows/trybot.yml?query=branch%3Amaster+event%3Apush)
1818
[![GolangCI](https://golangci.com/badges/github.com/cue-lang/cue.svg)](https://golangci.com/r/github.com/cue-lang/cue)
19-
[![Go 1.19+](https://img.shields.io/badge/go-1.19-9cf.svg)](https://golang.org/dl/)
19+
[![Go 1.20+](https://img.shields.io/badge/go-1.20-9cf.svg)](https://golang.org/dl/)
2020
[![platforms](https://img.shields.io/badge/platforms-linux|windows|macos-inactive.svg)]()
2121

2222
# The CUE Data Constraint Language

doc/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Currently CUE can only be installed from source.
66

77
### Prerequisites
88

9-
Go 1.19 or higher (see below)
9+
Go 1.20 or higher (see below)
1010

1111
### Installing CUE
1212

encoding/gocode/testdata/pkg1/cue_gen.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

encoding/gocode/testdata/pkg2/cue_gen.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module cuelang.org/go
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/cockroachdb/apd/v3 v3.2.0

internal/ci/repo/repo.cue

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ linuxMachine: "ubuntu-22.04"
2828
macosMachine: "macos-11"
2929
windowsMachine: "windows-2022"
3030

31-
previousStableGo: "1.19.x"
31+
previousStableGo: "1.20.x"
3232

3333
// Use the latest Go version for extra checks,
3434
// such as running tests with the data race detector.
35-
latestStableGo: "1.20.x"
35+
latestStableGo: "1.21.x"
3636

3737
// Use a specific latest version for release builds.
3838
// Note that we don't want ".x" for the sake of reproducibility,
3939
// so we instead pin a specific Go release.
40-
pinnedReleaseGo: "1.20.6"
40+
pinnedReleaseGo: "1.21.0"
4141

4242
goreleaserVersion: "v1.18.2"
4343

internal/filetypes/types.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)