Skip to content

Commit 7e284a3

Browse files
aykevldeadprogram
aykevl
authored and
deadprogram
committed
ci: use Go 1.23
1 parent b6c53a6 commit 7e284a3

File tree

11 files changed

+29
-21
lines changed

11 files changed

+29
-21
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ jobs:
107107
# "make lint" fails before go 1.21 because internal/tools/go.mod specifies packages that require go 1.21
108108
fmt-check: false
109109
resource_class: large
110-
test-llvm18-go122:
110+
test-llvm18-go123:
111111
docker:
112-
- image: golang:1.22-bullseye
112+
- image: golang:1.23-bullseye
113113
steps:
114114
- test-linux:
115115
llvm: "18"
@@ -122,4 +122,4 @@ workflows:
122122
# least the smoke tests still pass.
123123
- test-llvm15-go119
124124
# This tests LLVM 18 support when linking against system libraries.
125-
- test-llvm18-go122
125+
- test-llvm18-go123

‎.github/workflows/build-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install Go
3838
uses: actions/setup-go@v5
3939
with:
40-
go-version: '1.22'
40+
go-version: '1.23'
4141
cache: true
4242
- name: Restore LLVM source cache
4343
uses: actions/cache/restore@v4
@@ -145,7 +145,7 @@ jobs:
145145
- name: Install Go
146146
uses: actions/setup-go@v5
147147
with:
148-
go-version: '1.22'
148+
go-version: '1.23'
149149
cache: true
150150
- name: Build TinyGo (LLVM ${{ matrix.version }})
151151
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.22-alpine
21+
image: golang:1.23-alpine
2222
steps:
2323
- name: Install apk dependencies
2424
# tar: needed for actions/cache@v4
@@ -141,7 +141,7 @@ jobs:
141141
- name: Install Go
142142
uses: actions/setup-go@v5
143143
with:
144-
go-version: '1.22'
144+
go-version: '1.23'
145145
cache: true
146146
- name: Install wasmtime
147147
uses: bytecodealliance/actions/wasmtime/setup@v1
@@ -184,7 +184,7 @@ jobs:
184184
- name: Install Go
185185
uses: actions/setup-go@v5
186186
with:
187-
go-version: '1.22'
187+
go-version: '1.23'
188188
cache: true
189189
- name: Install Node.js
190190
uses: actions/setup-node@v4
@@ -307,7 +307,7 @@ jobs:
307307
- name: Install Go
308308
uses: actions/setup-go@v5
309309
with:
310-
go-version: '1.22'
310+
go-version: '1.23'
311311
cache: true
312312
- name: Restore LLVM source cache
313313
uses: actions/cache/restore@v4

‎.github/workflows/windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install Go
3636
uses: actions/setup-go@v5
3737
with:
38-
go-version: '1.22'
38+
go-version: '1.23'
3939
cache: true
4040
- name: Restore cached LLVM source
4141
uses: actions/cache/restore@v4
@@ -143,7 +143,7 @@ jobs:
143143
- name: Install Go
144144
uses: actions/setup-go@v5
145145
with:
146-
go-version: '1.22'
146+
go-version: '1.23'
147147
cache: true
148148
- name: Download TinyGo build
149149
uses: actions/download-artifact@v4
@@ -173,7 +173,7 @@ jobs:
173173
- name: Install Go
174174
uses: actions/setup-go@v5
175175
with:
176-
go-version: '1.22'
176+
go-version: '1.23'
177177
cache: true
178178
- name: Download TinyGo build
179179
uses: actions/download-artifact@v4
@@ -209,7 +209,7 @@ jobs:
209209
- name: Install Go
210210
uses: actions/setup-go@v5
211211
with:
212-
go-version: '1.22'
212+
go-version: '1.23'
213213
cache: true
214214
- name: Download TinyGo build
215215
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.22 AS tinygo-llvm
2+
FROM golang:1.23 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.22 AS tinygo-compiler
36+
FROM golang:1.23 AS tinygo-compiler
3737

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

‎GNUmakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ endif
370370
# Additional standard library packages that pass tests on individual platforms
371371
TEST_PACKAGES_LINUX := \
372372
archive/zip \
373-
bytes \
374373
compress/flate \
375374
crypto/hmac \
376375
debug/dwarf \
@@ -381,7 +380,6 @@ TEST_PACKAGES_LINUX := \
381380
net \
382381
os/user \
383382
strconv \
384-
testing/fstest \
385383
text/tabwriter \
386384
text/template/parse
387385

‎builder/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
2727
if err != nil {
2828
return nil, err
2929
}
30-
if major != 1 || minor < 19 || minor > 22 {
30+
if major != 1 || minor < 19 || minor > 23 {
3131
// Note: when this gets updated, also update the Go compatibility matrix:
3232
// https://github.com/tinygo-org/tinygo-site/blob/dev/content/docs/reference/go-compat-matrix.md
33-
return nil, fmt.Errorf("requires go version 1.19 through 1.22, got go%d.%d", major, minor)
33+
return nil, fmt.Errorf("requires go version 1.19 through 1.23, got go%d.%d", major, minor)
3434
}
3535

3636
return &compileopts.Config{

‎main_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func runPlatTests(options compileopts.Options, tests []string, t *testing.T) {
215215
}
216216
}
217217
if options.GOOS == "linux" && (options.GOARCH == "mips" || options.GOARCH == "mipsle") {
218-
if name == "atomic.go" {
218+
if name == "atomic.go" || name == "timers.go" {
219219
// 64-bit atomic operations aren't currently supported on MIPS.
220220
continue
221221
}
@@ -246,6 +246,11 @@ func runPlatTests(options compileopts.Options, tests []string, t *testing.T) {
246246
// some compiler changes).
247247
continue
248248

249+
case "timers.go":
250+
// Crashes starting with Go 1.23.
251+
// Bug: https://github.com/llvm/llvm-project/issues/104032
252+
continue
253+
249254
default:
250255
}
251256
}

‎src/syscall/syscall_libc_darwin.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const (
5555
F_GETFL = 0x3
5656
F_SETFL = 0x4
5757
O_NONBLOCK = 0x4
58+
TIOCSPGRP = 0x80047476
5859
)
5960

6061
// Source: https://opensource.apple.com/source/xnu/xnu-7195.141.2/bsd/sys/errno.h.auto.html

‎src/syscall/syscall_libc_wasi.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ const (
104104
// ../../lib/wasi-libc/expected/wasm32-wasi/predefined-macros.txt
105105
F_GETFL = 3
106106
F_SETFL = 4
107+
108+
// ../../lib/wasi-libc/libc-top-half/musl/arch/generic/bits/ioctl.h
109+
TIOCSPGRP = 0x5410
107110
)
108111

109112
// These values are needed as a stub until Go supports WASI as a full target.
@@ -114,6 +117,7 @@ const (
114117
SYS_FCNTL
115118
SYS_FCNTL64
116119
SYS_FSTATAT64
120+
SYS_IOCTL
117121
SYS_OPENAT
118122
SYS_UNLINKAT
119123
PATH_MAX = 4096

0 commit comments

Comments
 (0)