From 5e60c9c443796d3b4d75d7e031ea7df7b9976529 Mon Sep 17 00:00:00 2001 From: Or Shachar Date: Mon, 9 Sep 2024 16:36:44 -0400 Subject: [PATCH] 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 defe0a8..c2c114c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,21 @@ jobs: working_directory: ~/repo docker: - image: cimg/go:1.21 + steps: *simple_job_steps + + 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: @@ -32,14 +47,6 @@ jobs: command: | make ci - # 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 - 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 4508123..18d8080 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.