From 1e6c14b3e4015fa25e921cb1748e10f176e8c209 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Sat, 24 Sep 2022 10:49:31 +0200 Subject: [PATCH] ci: build TinyGo using Go 1.19 We've supported Go 1.19 for a while now, let's actually use it in CI. --- .circleci/config.yml | 10 ---------- .github/workflows/build-macos.yml | 4 ++-- .github/workflows/linux.yml | 10 +++++----- .github/workflows/windows.yml | 2 +- Dockerfile | 2 +- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8756f699..4bd2ed68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,13 +118,6 @@ jobs: steps: - test-linux: llvm: "14" - test-llvm14-go119: - docker: - - image: golang:1.19beta1-buster - steps: - - test-linux: - llvm: "14" - fmt-check: false workflows: test-all: @@ -132,6 +125,3 @@ workflows: # This tests our lowest supported versions of Go and LLVM, to make sure at # least the smoke tests still pass. - test-llvm14-go118 - # This tests a beta version of Go. It should be removed once regular - # release builds are built using this version. - - test-llvm14-go119 diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 39730c6c..2059574a 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -34,7 +34,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Cache LLVM source uses: actions/cache@v3 @@ -114,7 +114,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Build TinyGo run: go install diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0fcdca8f..8fc52717 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.18-alpine + image: golang:1.19-alpine steps: - name: Install apk dependencies # tar: needed for actions/cache@v3 @@ -118,7 +118,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Install wasmtime run: | @@ -171,7 +171,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Install Node.js uses: actions/setup-node@v2 @@ -271,7 +271,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Cache LLVM source uses: actions/cache@v3 @@ -371,7 +371,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Cache LLVM source uses: actions/cache@v3 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8ca8cd13..76c010cf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -29,7 +29,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' cache: true - name: Cache LLVM source uses: actions/cache@v3 diff --git a/Dockerfile b/Dockerfile index 2710b158..da6d8123 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # tinygo-llvm stage obtains the llvm source for TinyGo -FROM golang:1.18 AS tinygo-llvm +FROM golang:1.19 AS tinygo-llvm RUN apt-get update && \ apt-get install -y apt-utils make cmake clang-11 binutils-avr gcc-avr avr-libc ninja-build