Skip to content

Commit 55ad921

Browse files
committed
Allow Go 1.18
1 parent 7f7b0bf commit 55ad921

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

.github/workflows/build-macos.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,21 @@ on:
99

1010
jobs:
1111
build-macos:
12-
name: build-macos
12+
name: build-macos with Go ${{ matrix.go-version }}
1313
runs-on: macos-10.15
14+
strategy:
15+
matrix:
16+
include:
17+
- go-version: '1.17'
18+
go-stable: true
19+
- go-version: '1.18'
20+
go-stable: false
1421
steps:
1522
- name: Install Go
1623
uses: actions/setup-go@v2
1724
with:
18-
go-version: '1.17'
25+
go-version: ${{ matrix.go-version }}
26+
stable: ${{ matrix.go-stable }}
1927
- name: Install Dependencies
2028
shell: bash
2129
run: |

.github/workflows/linux.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,15 @@ jobs:
137137
assert-test-linux:
138138
# Run all tests that can run on Linux, with LLVM assertions enabled to catch
139139
# potential bugs.
140+
name: assert-test-linux with Go ${{ matrix.go-version }}
140141
runs-on: ubuntu-latest
142+
strategy:
143+
matrix:
144+
include:
145+
- go-version: '1.17'
146+
go-stable: true
147+
- go-version: '1.18'
148+
go-stable: false
141149
steps:
142150
- name: Checkout
143151
uses: actions/checkout@v2
@@ -159,7 +167,8 @@ jobs:
159167
- name: Install Go
160168
uses: actions/setup-go@v2
161169
with:
162-
go-version: '1.17'
170+
go-version: ${{ matrix.go-version }}
171+
stable: ${{ matrix.go-stable }}
163172
- name: Install Node.js
164173
uses: actions/setup-node@v2
165174
with:

.github/workflows/windows.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,21 @@ on:
99

1010
jobs:
1111
build-windows:
12+
name: build-windows with Go ${{ matrix.go-version }}
1213
runs-on: windows-2019
14+
strategy:
15+
matrix:
16+
include:
17+
- go-version: '1.17'
18+
go-stable: true
19+
- go-version: '1.18'
20+
go-stable: false
1321
steps:
1422
- name: Install Go
1523
uses: actions/setup-go@v2
1624
with:
17-
go-version: '1.17'
25+
go-version: ${{ matrix.go-version }}
26+
stable: ${{ matrix.go-stable }}
1827
- uses: brechtm/setup-scoop@v2
1928
- name: Install Dependencies
2029
shell: bash

builder/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
3333
if err != nil {
3434
return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
3535
}
36-
if major != 1 || minor < 15 || minor > 17 {
37-
return nil, fmt.Errorf("requires go version 1.15 through 1.17, got go%d.%d", major, minor)
36+
if major != 1 || minor < 15 || minor > 18 {
37+
return nil, fmt.Errorf("requires go version 1.15 through 1.18, got go%d.%d", major, minor)
3838
}
3939

4040
clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))

0 commit comments

Comments
 (0)