From fd60fa1452db1d971e028f1a8d886a13ebea7aa8 Mon Sep 17 00:00:00 2001 From: Or Shachar Date: Mon, 9 Sep 2024 16:28:58 -0400 Subject: [PATCH 1/3] chore: update to Golang 1.23 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5515d0b..1d6ac4c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine as builder +FROM golang:1.23-alpine as builder MAINTAINER Fullstory Engineering # create non-privileged group and user From 5e60c9c443796d3b4d75d7e031ea7df7b9976529 Mon Sep 17 00:00:00 2001 From: Or Shachar Date: Mon, 9 Sep 2024 16:36:44 -0400 Subject: [PATCH 2/3] chore: configure cci to build with 1.23 Signed-off-by: Or Shachar --- .circleci/config.yml | 24 ++++++++++++++++-------- Makefile | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index defe0a84..c2c114cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,21 +25,28 @@ jobs: working_directory: ~/repo docker: - image: cimg/go:1.21 - steps: - - checkout - - run: - name: Run tests and linters - command: | - make ci + steps: *simple_job_steps - # TODO: Need updates to some static analyzer tools to support 1.22. After those - # are updated, move the full linting from 1.21 to this latest release. build-1-22: working_directory: ~/repo docker: - image: cimg/go:1.22 steps: *simple_job_steps + # TODO: Need updates to some static analyzer tools to support 1.22. After those + # are updated, move the full linting from 1.21 to this latest release. + + build-1-23: + working_directory: ~/repo + docker: + - image: cimg/go:1.23 + steps: + - checkout + - run: + name: Run tests and linters + command: | + make ci + workflows: pr-build-test: jobs: @@ -47,3 +54,4 @@ workflows: - build-1-20 - build-1-21 - build-1-22 + - build-1-23 \ No newline at end of file diff --git a/Makefile b/Makefile index 45081232..18d80801 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ vet: .PHONY: staticcheck staticcheck: - @go install honnef.co/go/tools/cmd/staticcheck@v0.4.3 + @go install honnef.co/go/tools/cmd/staticcheck@v0.5.1 staticcheck ./... .PHONY: ineffassign @@ -77,7 +77,7 @@ ineffassign: .PHONY: predeclared predeclared: - @go install github.com/nishanths/predeclared@5f2f810c9ae6 + @go install github.com/nishanths/predeclared@245576f9a85c predeclared ./... # Intentionally omitted from CI, but target here for ad-hoc reports. From 7279588086d1a2785e6df6f69dc2847bbaca07ad Mon Sep 17 00:00:00 2001 From: Scott Blum Date: Fri, 25 Oct 2024 09:18:25 -0400 Subject: [PATCH 3/3] Update config.yml --- .circleci/config.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2c114cf..30441dd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,18 +9,6 @@ shared_configs: # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference version: 2.1 jobs: - build-1-19: - working_directory: ~/repo - docker: - - image: cimg/go:1.19 - steps: *simple_job_steps - - build-1-20: - working_directory: ~/repo - docker: - - image: cimg/go:1.20 - steps: *simple_job_steps - build-1-21: working_directory: ~/repo docker: @@ -33,9 +21,6 @@ jobs: - image: cimg/go:1.22 steps: *simple_job_steps - # TODO: Need updates to some static analyzer tools to support 1.22. After those - # are updated, move the full linting from 1.21 to this latest release. - build-1-23: working_directory: ~/repo docker: @@ -50,8 +35,6 @@ jobs: workflows: pr-build-test: jobs: - - build-1-19 - - build-1-20 - build-1-21 - build-1-22 - - build-1-23 \ No newline at end of file + - build-1-23