Skip to content

Commit a51ed41

Browse files
authored
Merge pull request #294 from bytecodealliance/ydnar/go1.24.0
all: add support for Go 1.24, drop Go 1.22
2 parents 18d0654 + 733ad35 commit a51ed41

File tree

8 files changed

+29
-14
lines changed

8 files changed

+29
-14
lines changed

.github/workflows/test.yaml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
timeout-minutes: 15
4545
strategy:
4646
matrix:
47-
go-version: ["1.22", "1.23"]
47+
go-version: ["1.23", "1.24"]
4848
steps:
4949
- name: Checkout repo
5050
uses: actions/checkout@v4
@@ -77,8 +77,13 @@ jobs:
7777
timeout-minutes: 15
7878
strategy:
7979
matrix:
80-
go-version: ["1.22", "1.23"]
81-
tinygo-version: ["0.33.0", "0.34.0", "0.35.0"]
80+
go-version: ["1.23", "1.24"]
81+
tinygo-version: ["0.34.0", "0.35.0", "0.36.0"]
82+
exclude:
83+
- go-version: "1.24"
84+
tinygo-version: "0.34.0"
85+
- go-version: "1.24"
86+
tinygo-version: "0.35.0"
8287
steps:
8388
- name: Checkout repo
8489
uses: actions/checkout@v4
@@ -108,8 +113,13 @@ jobs:
108113
timeout-minutes: 15
109114
strategy:
110115
matrix:
111-
go-version: ["1.22", "1.23"]
112-
tinygo-version: ["0.33.0", "0.34.0", "0.35.0"]
116+
go-version: ["1.23", "1.24"]
117+
tinygo-version: ["0.34.0", "0.35.0", "0.36.0"]
118+
exclude:
119+
- go-version: "1.24"
120+
tinygo-version: "0.34.0"
121+
- go-version: "1.24"
122+
tinygo-version: "0.35.0"
113123
steps:
114124
- name: Checkout repo
115125
uses: actions/checkout@v4
@@ -138,7 +148,9 @@ jobs:
138148
version: ${{ env.wasmtime-version }}
139149

140150
- name: Add Go wasm exec to $PATH
141-
run: echo "$(go env GOROOT)/misc/wasm" >> $GITHUB_PATH
151+
run: |
152+
echo "$(go env GOROOT)/misc/wasm" >> $GITHUB_PATH
153+
echo "$(go env GOROOT)/lib/wasm" >> $GITHUB_PATH
142154
143155
- name: Regenerate Go
144156
run: make tests/generated
@@ -158,8 +170,7 @@ jobs:
158170
- name: Test wasm/wasip2 with TinyGo
159171
run: tinygo test -v -target=wasip2 ${{ env.go-modules }}
160172

161-
- name: Test generated Go with TinyGo >= 0.34.0
162-
if: ${{ matrix.tinygo-version != '0.33.0' }}
173+
- name: Test generated Go with TinyGo
163174
run: tinygo test -v -target wasip2 ./tests/...
164175

165176
- name: Verify repo is unchanged

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
1414

1515
- Breaking: generated `*.wasm.go` files will now have correct WIT kebab-case base name. Interfaces or worlds with `-` in their name will require removal of the previous `*.wasm.go` files.
1616
- Breaking: upgraded to `wasm-tools` [v1.227.1](https://github.com/bytecodealliance/wasm-tools/releases/tag/v1.227.1), which [removes support](https://github.com/bytecodealliance/wasm-tools/pull/2050) for multiple return values and flags with > 32 values. To ease migration, this package will continue to support JSON generated by `wasm-tools` v1.225.0 and earlier.
17-
- Dropped support for TinyGo v0.32.0.
17+
- Dropped support for TinyGo v0.32.0 and v0.33.0.
18+
- Added support for Go 1.24 and dropped support for Go 1.22.
1819

1920
### Fixed
2021

cm/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module go.bytecodealliance.org/cm
22

3-
go 1.22.0
3+
go 1.23.0

cmd/wit-bindgen-go/main_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// TODO: Remove the following go:build line when TinyGo supports Go 1.24.
2+
//go:build !(tinygo && go1.24)
3+
14
package main
25

36
import (

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.bytecodealliance.org
22

3-
go 1.22.0
3+
go 1.23.0
44

55
require (
66
github.com/coreos/go-semver v0.3.1

go.work

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.22.0
1+
go 1.23.0
22

33
use (
44
.

testdata/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// This go.mod file exists to prevent the testdata directory from being included in module distribution.
22
module testdata
33

4-
go 1.22.0
4+
go 1.23.0

tests/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module tests
22

3-
go 1.22.0
3+
go 1.23.0

0 commit comments

Comments
 (0)