Skip to content

Commit 05f9778

Browse files
committed
all: add Go 1.25 support
1 parent 76f0ba3 commit 05f9778

File tree

8 files changed

+27
-14
lines changed

8 files changed

+27
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
# This tests the latest supported LLVM version when linking against system
106106
# libraries.
107107
docker:
108-
- image: golang:1.24-bullseye
108+
- image: golang:1.25-bullseye
109109
steps:
110110
- test-linux:
111111
llvm: "20"

.github/workflows/build-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install Go
4040
uses: actions/setup-go@v5
4141
with:
42-
go-version: '1.24'
42+
go-version: '1.25.0-rc.2'
4343
cache: true
4444
- name: Restore LLVM source cache
4545
uses: actions/cache/restore@v4
@@ -134,7 +134,7 @@ jobs:
134134
- name: Install Go
135135
uses: actions/setup-go@v5
136136
with:
137-
go-version: '1.24'
137+
go-version: '1.25.0-rc.2'
138138
cache: true
139139
- name: Build TinyGo (LLVM ${{ matrix.version }})
140140
run: go install -tags=llvm${{ matrix.version }}

.github/workflows/linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# statically linked binary.
1919
runs-on: ubuntu-latest
2020
container:
21-
image: golang:1.24-alpine
21+
image: golang:1.25rc2-alpine
2222
outputs:
2323
version: ${{ steps.version.outputs.version }}
2424
steps:
@@ -137,7 +137,7 @@ jobs:
137137
- name: Install Go
138138
uses: actions/setup-go@v5
139139
with:
140-
go-version: '1.24'
140+
go-version: '1.25.0-rc.2'
141141
cache: true
142142
- name: Install wasmtime
143143
uses: bytecodealliance/actions/wasmtime/setup@v1
@@ -181,7 +181,7 @@ jobs:
181181
- name: Install Go
182182
uses: actions/setup-go@v5
183183
with:
184-
go-version: '1.24'
184+
go-version: '1.25.0-rc.2'
185185
cache: true
186186
- name: Install Node.js
187187
uses: actions/setup-node@v4
@@ -298,7 +298,7 @@ jobs:
298298
- name: Install Go
299299
uses: actions/setup-go@v5
300300
with:
301-
go-version: '1.24'
301+
go-version: '1.25.0-rc.2'
302302
cache: true
303303
- name: Restore LLVM source cache
304304
uses: actions/cache/restore@v4

.github/workflows/windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install Go
4242
uses: actions/setup-go@v5
4343
with:
44-
go-version: '1.24'
44+
go-version: '1.25.0-rc.2'
4545
cache: true
4646
- name: Restore cached LLVM source
4747
uses: actions/cache/restore@v4
@@ -147,7 +147,7 @@ jobs:
147147
- name: Install Go
148148
uses: actions/setup-go@v5
149149
with:
150-
go-version: '1.24'
150+
go-version: '1.25.0-rc.2'
151151
cache: true
152152
- name: Download TinyGo build
153153
uses: actions/download-artifact@v4
@@ -177,7 +177,7 @@ jobs:
177177
- name: Install Go
178178
uses: actions/setup-go@v5
179179
with:
180-
go-version: '1.24'
180+
go-version: '1.25.0-rc.2'
181181
cache: true
182182
- name: Download TinyGo build
183183
uses: actions/download-artifact@v4
@@ -213,7 +213,7 @@ jobs:
213213
- name: Install Go
214214
uses: actions/setup-go@v5
215215
with:
216-
go-version: '1.24'
216+
go-version: '1.25.0-rc.2'
217217
cache: true
218218
- name: Download TinyGo build
219219
uses: actions/download-artifact@v4

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# tinygo-llvm stage obtains the llvm source for TinyGo
2-
FROM golang:1.24 AS tinygo-llvm
2+
FROM golang:1.25 AS tinygo-llvm
33

44
RUN apt-get update && \
55
apt-get install -y apt-utils make cmake clang-15 ninja-build && \
@@ -33,7 +33,7 @@ RUN cd /tinygo/ && \
3333

3434
# tinygo-compiler copies the compiler build over to a base Go container (without
3535
# all the build tools etc).
36-
FROM golang:1.24 AS tinygo-compiler
36+
FROM golang:1.25 AS tinygo-compiler
3737

3838
# Copy tinygo build.
3939
COPY --from=tinygo-compiler-build /tinygo/build/release/tinygo /tinygo

builder/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
2626

2727
// Version range supported by TinyGo.
2828
const minorMin = 19
29-
const minorMax = 24
29+
const minorMax = 25
3030

3131
// Check that we support this Go toolchain version.
3232
gorootMajor, gorootMinor, err := goenv.GetGorootVersion()

src/internal/abi/escape.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ import "unsafe"
88
func NoEscape(p unsafe.Pointer) unsafe.Pointer {
99
return p
1010
}
11+
12+
func Escape[T any](x T) T {
13+
// This function is used from internal/synctest which also uses a few other
14+
// functions that aren't implemented but don't seem to be used by many
15+
// packages.
16+
// This probably needs support from the compiler to implement correctly.
17+
panic("internal/abi.Escape: unimplemented")
18+
}

src/runtime/time.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,8 @@ func timerCallback(tn *timerNode, delta int64) {
4646
addTimer(tn)
4747
}
4848
}
49+
50+
//go:linkname time_runtimeIsBubbled time.runtimeIsBubbled
51+
func time_runtimeIsBubbled() bool {
52+
return false
53+
}

0 commit comments

Comments
 (0)