aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAyke van Laethem <[email protected]>2024-02-07 12:16:09 +0100
committerRon Evans <[email protected]>2024-02-20 21:58:09 +0100
commit5baee9a8ee4f958b8adb4d336fbb6ac522269dfc (patch)
tree9d29e5e390361ae84a42bfbea08e510b3aa6a69e
parentc47f52b54607c5dd1453f1fbe949876314c8a342 (diff)
downloadtinygo-5baee9a8ee4f958b8adb4d336fbb6ac522269dfc.tar.gz
tinygo-5baee9a8ee4f958b8adb4d336fbb6ac522269dfc.zip
ci: switch to Go 1.22
-rw-r--r--.circleci/config.yml15
-rw-r--r--.github/workflows/build-macos.yml4
-rw-r--r--.github/workflows/linux.yml8
-rw-r--r--.github/workflows/windows.yml8
-rw-r--r--Dockerfile2
5 files changed, 14 insertions, 23 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ff6e2b2e6..11e58108f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,16 +105,9 @@ jobs:
- test-linux:
llvm: "15"
resource_class: large
- test-llvm16-go122:
+ test-llvm17-go122:
docker:
- - image: golang:1.22-rc-bullseye
- steps:
- - test-linux:
- llvm: "16"
- resource_class: large
- test-llvm17-go121:
- docker:
- - image: golang:1.21-bullseye
+ - image: golang:1.22-bullseye
steps:
- test-linux:
llvm: "17"
@@ -126,7 +119,5 @@ workflows:
# This tests our lowest supported versions of Go and LLVM, to make sure at
# least the smoke tests still pass.
- test-llvm15-go118
- # This tests the upcoming Go 1.22 support.
- - test-llvm16-go122
# This tests LLVM 17 support when linking against system libraries.
- - test-llvm17-go121
+ - test-llvm17-go122
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 23150ef33..29e11284b 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -37,7 +37,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Restore LLVM source cache
uses: actions/cache/restore@v4
@@ -145,7 +145,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Build TinyGo (LLVM ${{ matrix.version }})
run: go install -tags=llvm${{ matrix.version }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a6fabbb5d..9b6c8d895 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -18,7 +18,7 @@ jobs:
# statically linked binary.
runs-on: ubuntu-latest
container:
- image: golang:1.21-alpine
+ image: golang:1.22-alpine
steps:
- name: Install apk dependencies
# tar: needed for actions/cache@v4
@@ -135,7 +135,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Install wasmtime
run: |
@@ -178,7 +178,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Install Node.js
uses: actions/setup-node@v4
@@ -301,7 +301,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Restore LLVM source cache
uses: actions/cache/restore@v4
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index dcca24f98..d03d2b507 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -35,7 +35,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Restore cached LLVM source
uses: actions/cache/restore@v4
@@ -143,7 +143,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Download TinyGo build
uses: actions/download-artifact@v4
@@ -173,7 +173,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Download TinyGo build
uses: actions/download-artifact@v4
@@ -209,7 +209,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
cache: true
- name: Download TinyGo build
uses: actions/download-artifact@v4
diff --git a/Dockerfile b/Dockerfile
index 75b125a87..3da26425d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# tinygo-llvm stage obtains the llvm source for TinyGo
-FROM golang:1.21 AS tinygo-llvm
+FROM golang:1.22 AS tinygo-llvm
RUN apt-get update && \
apt-get install -y apt-utils make cmake clang-15 ninja-build && \