From 61f1bd16c48e29bcde0c46e6912eebda17d4ab5e Mon Sep 17 00:00:00 2001 From: Ola Okelola <10857143+lolopinto@users.noreply.github.com> Date: Thu, 17 Aug 2023 12:20:12 -0700 Subject: [PATCH] go 1.21 (#1610) --- .github/workflows/e2e.yml | 2 +- .github/workflows/go_ci.yml | 2 +- .github/workflows/new_docker_image.yml | 2 +- docs/docs/advanced-topics/running-locally.md | 2 +- go.mod | 2 +- ts/Dockerfile | 8 ++++---- ts/Dockerfile.tmpl | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 3a446efe8..28e46466a 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -49,7 +49,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' check-latest: true cache: true diff --git a/.github/workflows/go_ci.yml b/.github/workflows/go_ci.yml index cb155c281..6e05a3672 100644 --- a/.github/workflows/go_ci.yml +++ b/.github/workflows/go_ci.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' check-latest: true cache: true diff --git a/.github/workflows/new_docker_image.yml b/.github/workflows/new_docker_image.yml index cbdce81c2..d5c92c7b8 100644 --- a/.github/workflows/new_docker_image.yml +++ b/.github/workflows/new_docker_image.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/docs/docs/advanced-topics/running-locally.md b/docs/docs/advanced-topics/running-locally.md index 8c3a582fb..49c8dd499 100644 --- a/docs/docs/advanced-topics/running-locally.md +++ b/docs/docs/advanced-topics/running-locally.md @@ -14,7 +14,7 @@ There's 3 major runtimes we use: Here's the steps to install locally: -* Install [golang](https://golang.org/doc/install#download) version of 1.20 +* Install [golang](https://golang.org/doc/install#download) version of 1.21 * Get the latest version of the Ent CLI: ```shell diff --git a/go.mod b/go.mod index dd631ca08..22b55b7c6 100644 --- a/go.mod +++ b/go.mod @@ -29,4 +29,4 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) -go 1.20 +go 1.21 diff --git a/ts/Dockerfile b/ts/Dockerfile index 8035696ea..8f6387d8d 100644 --- a/ts/Dockerfile +++ b/ts/Dockerfile @@ -1,10 +1,10 @@ -ARG GOLANG_VERSION=v0.1.0-alpha.49 -ARG AUTO_SCHEMA_VERSION=0.0.26 +ARG GOLANG_VERSION=v0.1.4 +ARG AUTO_SCHEMA_VERSION=0.0.29 ARG NODE_VERSION=18 -ARG DOCKER_TAG=v0.1.0-alpha.37 +ARG DOCKER_TAG=v0.1.4 # get and install tsent -FROM --platform=$BUILDPLATFORM golang:1.20-buster As golang-image +FROM --platform=$BUILDPLATFORM golang:1.21-bullseye As golang-image ARG GOLANG_VERSION ARG DOCKER_TAG ENV GOPATH=$HOME/go diff --git a/ts/Dockerfile.tmpl b/ts/Dockerfile.tmpl index 6df470e18..ceccc6ce6 100644 --- a/ts/Dockerfile.tmpl +++ b/ts/Dockerfile.tmpl @@ -4,7 +4,7 @@ ARG NODE_VERSION={{.NodeVersion}} ARG DOCKER_TAG={{.DockerTag}} # get and install tsent -FROM golang:1.20-buster AS golang-image +FROM golang:1.21-bullseye AS golang-image ARG GOLANG_VERSION ARG DOCKER_TAG ENV GOPATH=$HOME/go