From e371a89ca6c463c950d8a7b6054654e9a2622e39 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Mon, 23 Oct 2023 10:05:39 -0700 Subject: [PATCH 1/3] build(deps): Upgrade wasmtime-go from 13.0.0 to 14.0.0 This upgrade should fix the broken Windows build. --- .github/workflows/ci.yml | 4 +--- go.mod | 1 + go.sum | 2 ++ internal/ext/wasm/wasm.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6eba6dcfe..c506c46b60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,12 +6,10 @@ on: pull_request: jobs: windows-build: - if: ${{ github.ref == 'refs/heads/main' }} + # if: ${{ github.ref == 'refs/heads/main' }} runs-on: windows-latest steps: - uses: actions/checkout@v4 - # wasmtime can't be built with 12.2 - - run: choco install mingw --version 11.2.0.07112021 --allow-downgrade - uses: actions/setup-go@v4 with: go-version: '1.21.3' diff --git a/go.mod b/go.mod index 532b10ff9e..b5198dd42c 100644 --- a/go.mod +++ b/go.mod @@ -28,6 +28,7 @@ require ( require ( github.com/benbjohnson/clock v1.3.5 // indirect + github.com/bytecodealliance/wasmtime-go/v14 v14.0.0 // indirect github.com/jackc/pgconn v1.14.1 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect diff --git a/go.sum b/go.sum index a5e0c29340..66e8849b8c 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/bytecodealliance/wasmtime-go/v13 v13.0.0 h1:o2PsUgSu6vMKr5S0+mz8EL3mZGQ0M8gHwS8/R0wY/wY= github.com/bytecodealliance/wasmtime-go/v13 v13.0.0/go.mod h1:KmsZLdjjzNH/E5wbfoRehqP70tHzKlfNOi730VCAR4E= +github.com/bytecodealliance/wasmtime-go/v14 v14.0.0 h1:ur7S3P+PAeJmgllhSrKnGQOAmmtUbLQxb/nw2NZiaEM= +github.com/bytecodealliance/wasmtime-go/v14 v14.0.0/go.mod h1:tqOVEUjnXY6aGpSfM9qdVRR6G//Yc513fFYUdzZb/DY= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go index a06d86796e..1338769403 100644 --- a/internal/ext/wasm/wasm.go +++ b/internal/ext/wasm/wasm.go @@ -26,7 +26,7 @@ import ( ) // This version must be updated whenever the wasmtime-go dependency is updated -const wasmtimeVersion = `v13.0.0` +const wasmtimeVersion = `v14.0.0` func cacheDir() (string, error) { cache := os.Getenv("SQLCCACHE") From 10aea65f3b2a70e12c753098dea00e30257989e0 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Mon, 23 Oct 2023 10:08:11 -0700 Subject: [PATCH 2/3] Actually upgrade --- go.mod | 3 +-- go.sum | 2 -- internal/ext/wasm/wasm.go | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b5198dd42c..06b9f4f090 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 - github.com/bytecodealliance/wasmtime-go/v13 v13.0.0 + github.com/bytecodealliance/wasmtime-go/v14 v14.0.0 github.com/cubicdaiya/gonp v1.0.4 github.com/davecgh/go-spew v1.1.1 github.com/go-sql-driver/mysql v1.7.1 @@ -28,7 +28,6 @@ require ( require ( github.com/benbjohnson/clock v1.3.5 // indirect - github.com/bytecodealliance/wasmtime-go/v14 v14.0.0 // indirect github.com/jackc/pgconn v1.14.1 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect diff --git a/go.sum b/go.sum index 66e8849b8c..4870a46943 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,6 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1/g github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/bytecodealliance/wasmtime-go/v13 v13.0.0 h1:o2PsUgSu6vMKr5S0+mz8EL3mZGQ0M8gHwS8/R0wY/wY= -github.com/bytecodealliance/wasmtime-go/v13 v13.0.0/go.mod h1:KmsZLdjjzNH/E5wbfoRehqP70tHzKlfNOi730VCAR4E= github.com/bytecodealliance/wasmtime-go/v14 v14.0.0 h1:ur7S3P+PAeJmgllhSrKnGQOAmmtUbLQxb/nw2NZiaEM= github.com/bytecodealliance/wasmtime-go/v14 v14.0.0/go.mod h1:tqOVEUjnXY6aGpSfM9qdVRR6G//Yc513fFYUdzZb/DY= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go index 1338769403..f626dbfd14 100644 --- a/internal/ext/wasm/wasm.go +++ b/internal/ext/wasm/wasm.go @@ -17,7 +17,7 @@ import ( "runtime/trace" "strings" - wasmtime "github.com/bytecodealliance/wasmtime-go/v13" + wasmtime "github.com/bytecodealliance/wasmtime-go/v14" "golang.org/x/sync/singleflight" "github.com/sqlc-dev/sqlc/internal/cache" From 8a7c93d0d33c6bcc45f65d959ec1b1c6d6f4013a Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Mon, 23 Oct 2023 10:15:53 -0700 Subject: [PATCH 3/3] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c506c46b60..edef06cd6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: pull_request: jobs: windows-build: - # if: ${{ github.ref == 'refs/heads/main' }} + if: ${{ github.ref == 'refs/heads/main' }} runs-on: windows-latest steps: - uses: actions/checkout@v4