Skip to content

Commit

Permalink
deps: update to depend on the cuelang.org/[email protected]
Browse files Browse the repository at this point in the history
Also bump the Go version used by the repo to go1.22.0 while we are here.

We also drop the unused latestStableGo field from our repo config
package.

The remainder of this change made by running:

    go get cuelang.org/[email protected]
    go mod tidy
    go generate ./...

in / and /play using go1.22.0.

Signed-off-by: Paul Jolly <[email protected]>
Change-Id: I58a5560791b102c1f70a73400850554581c8d2e2
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cuelang.org/+/1177281
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Jonathan Matthews <[email protected]>
  • Loading branch information
myitcv committed Feb 23, 2024
1 parent a167be8 commit dcd3516
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 25 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/trybot.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/workflows/update_tip.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion content/en/docs/tutorials/kubernetes.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion content/en/pkg.go.dev.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/cue-lang/cuelang.org
go 1.20

require (
cuelang.org/go v0.7.0
cuelang.org/go v0.7.1
github.com/apex/gateway v1.1.2
github.com/aws/aws-lambda-go v1.32.1
github.com/rogpeppe/testscript v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cuelabs.dev/go/oci/ociregistry v0.0.0-20231103182354-93e78c079a13 h1:zkiIe8AxZ/kDjqQN+mDKc5BxoVJOqioSdqApjc+eB1I=
cuelang.org/go v0.7.0 h1:gMztinxuKfJwMIxtboFsNc6s8AxwJGgsJV+3CuLffHI=
cuelang.org/go v0.7.0/go.mod h1:ix+3dM/bSpdG9xg6qpCgnJnpeLtciZu+O/rDbywoMII=
cuelang.org/go v0.7.1 h1:wSuUSIKR9M1yrph57l8EJATWVRWHaq/Zd0dFUL10PC8=
cuelang.org/go v0.7.1/go.mod h1:ix+3dM/bSpdG9xg6qpCgnJnpeLtciZu+O/rDbywoMII=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/apex/gateway v1.1.2 h1:OWyLov8eaau8YhkYKkRuOAYqiUhpBJalBR1o+3FzX+8=
github.com/apex/gateway v1.1.2/go.mod h1:AMTkVbz5u5Hvd6QOGhhg0JUrNgCcLVu3XNJOGntdoB4=
Expand Down
6 changes: 1 addition & 5 deletions internal/ci/repo/repo.cue
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@ botGitHubUserEmail: "[email protected]"

linuxMachine: "ubuntu-22.04"

// Use the latest Go version for extra checks,
// such as running tests with the data race detector.
latestStableGo: "1.20.x"

// Use a specific latest version for release builds.
// Note that we don't want ".x" for the sake of reproducibility,
// so we instead pin a specific Go release.
goVersion: "1.20.6"
goVersion: "1.22.0"

// Use a specific version of NodeJS for deploy purposes. This version
// is consistent between netlify and GitHub Actions usage.
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
command = "bash build.bash"

[build.environment]
GO_VERSION = "1.20.6"
GO_VERSION = "1.22.0"
HUGO_ENV = "production"
HUGO_VERSION = "0.115.4"
NODE_VERSION = "18.17.0"
Expand Down
2 changes: 1 addition & 1 deletion play/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/cue-sh/playground
go 1.20

require (
cuelang.org/go v0.7.0
cuelang.org/go v0.7.1
github.com/cockroachdb/apd/v3 v3.2.1
golang.org/x/text v0.13.0
)
Expand Down
4 changes: 2 additions & 2 deletions play/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cuelabs.dev/go/oci/ociregistry v0.0.0-20231103182354-93e78c079a13 h1:zkiIe8AxZ/kDjqQN+mDKc5BxoVJOqioSdqApjc+eB1I=
cuelabs.dev/go/oci/ociregistry v0.0.0-20231103182354-93e78c079a13/go.mod h1:XGKYSMtsJWfqQYPwq51ZygxAPqpEUj/9bdg16iDPTAA=
cuelang.org/go v0.7.0 h1:gMztinxuKfJwMIxtboFsNc6s8AxwJGgsJV+3CuLffHI=
cuelang.org/go v0.7.0/go.mod h1:ix+3dM/bSpdG9xg6qpCgnJnpeLtciZu+O/rDbywoMII=
cuelang.org/go v0.7.1 h1:wSuUSIKR9M1yrph57l8EJATWVRWHaq/Zd0dFUL10PC8=
cuelang.org/go v0.7.1/go.mod h1:ix+3dM/bSpdG9xg6qpCgnJnpeLtciZu+O/rDbywoMII=
github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
Expand Down
2 changes: 1 addition & 1 deletion play/src/components/gen_cuelang_org_go_version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const CUEVersion = "v0.7.0";
export const CUEVersion = "v0.7.1";
11 changes: 9 additions & 2 deletions play/src/wasm_exec.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@
this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true);
}

const setInt32 = (addr, v) => {
this.mem.setUint32(addr + 0, v, true);
}

const getInt64 = (addr) => {
const low = this.mem.getUint32(addr + 0, true);
const high = this.mem.getInt32(addr + 4, true);
Expand Down Expand Up @@ -206,7 +210,10 @@

const timeOrigin = Date.now() - performance.now();
this.importObject = {
go: {
_gotest: {
add: (a, b) => a + b,
},
gojs: {
// Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters)
// may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported
// function. A goroutine can switch to a new stack if the current stack is too small (see morestack function).
Expand Down Expand Up @@ -269,7 +276,7 @@
this._resume();
}
},
getInt64(sp + 8) + 1, // setTimeout has been seen to fire up to 1 millisecond early
getInt64(sp + 8),
));
this.mem.setInt32(sp + 16, id, true);
},
Expand Down

0 comments on commit dcd3516

Please sign in to comment.