From 0be78052f8151077948ab105433c2c0f2a0b2b44 Mon Sep 17 00:00:00 2001 From: Alan Parra Date: Tue, 5 Dec 2023 15:53:10 -0300 Subject: [PATCH 1/2] chore: Bump Go to 1.21.5 --- build.assets/versions.mk | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.assets/versions.mk b/build.assets/versions.mk index 4c4ea9116f0fc..19eb889fe2297 100644 --- a/build.assets/versions.mk +++ b/build.assets/versions.mk @@ -3,7 +3,7 @@ # Keep versions in sync with devbox.json, when applicable. # Sync with devbox.json. -GOLANG_VERSION ?= go1.21.4 +GOLANG_VERSION ?= go1.21.5 NODE_VERSION ?= 18.18.2 diff --git a/go.mod b/go.mod index d3c198daf978d..166e783220c4a 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/gravitational/teleport go 1.21 -toolchain go1.21.4 +toolchain go1.21.5 require ( cloud.google.com/go/compute v1.23.0 From 8e4cba20110705b21a01edcbb931410fe6c68afb Mon Sep 17 00:00:00 2001 From: Alan Parra Date: Tue, 5 Dec 2023 15:53:13 -0300 Subject: [PATCH 2/2] Run `make dronegen` --- .drone.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index afdd77038c47c..9523c9c64e3f2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -973,7 +973,7 @@ type: kubernetes name: build-linux-amd64-centos7 environment: BUILDBOX_VERSION: teleport14 - RUNTIME: go1.21.4 + RUNTIME: go1.21.5 trigger: event: include: @@ -1182,7 +1182,7 @@ type: kubernetes name: build-linux-amd64-centos7-fips environment: BUILDBOX_VERSION: teleport14 - RUNTIME: go1.21.4 + RUNTIME: go1.21.5 trigger: event: include: @@ -1390,7 +1390,7 @@ type: kubernetes name: build-linux-amd64 environment: BUILDBOX_VERSION: teleport14 - RUNTIME: go1.21.4 + RUNTIME: go1.21.5 trigger: event: include: @@ -1605,7 +1605,7 @@ type: kubernetes name: build-linux-amd64-fips environment: BUILDBOX_VERSION: teleport14 - RUNTIME: go1.21.4 + RUNTIME: go1.21.5 trigger: event: include: @@ -2905,7 +2905,7 @@ type: kubernetes name: build-linux-386 environment: BUILDBOX_VERSION: teleport14 - RUNTIME: go1.21.4 + RUNTIME: go1.21.5 trigger: event: include: @@ -3731,7 +3731,7 @@ type: kubernetes name: build-linux-arm environment: BUILDBOX_VERSION: teleport14 - RUNTIME: go1.21.4 + RUNTIME: go1.21.5 trigger: event: include: @@ -7607,7 +7607,7 @@ steps: "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport14 - --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=amd64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -7651,7 +7651,7 @@ steps: "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -7695,7 +7695,7 @@ steps: "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -11209,7 +11209,7 @@ steps: "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport14 - --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=amd64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -11255,7 +11255,7 @@ steps: "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -11301,7 +11301,7 @@ steps: "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -13627,7 +13627,7 @@ steps: "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport14 - --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=amd64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -13673,7 +13673,7 @@ steps: "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -13719,7 +13719,7 @@ steps: "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -16045,7 +16045,7 @@ steps: "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport14 - --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=x86_64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=amd64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -16091,7 +16091,7 @@ steps: "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=arm-linux-gnueabihf-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -16137,7 +16137,7 @@ steps: "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64 --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport14 - --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.4 + --build-arg COMPILER_NAME=aarch64-linux-gnu-gcc --build-arg GOLANG_VERSION=go1.21.5 --build-arg PROTOC_VERSION=3.20.3 --build-arg TARGETARCH=arm64 --build-arg BUILD_ARCH=amd64 /go/src/github.com/gravitational/teleport - docker logout "public.ecr.aws" @@ -16736,6 +16736,6 @@ image_pull_secrets: - DOCKERHUB_CREDENTIALS --- kind: signature -hmac: 3cebed3db6d2c1b09a8e7bbe4c009a6e6c3dc89c5517032f01603dc2b99e1728 +hmac: 3b052cce65bb7bd4eab162412717449fcf7b58513515290cc92989a54462053c ...