diff --git a/.golangci.yml b/.golangci.yml index 67173d3b..3ec69865 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,4 +1,6 @@ run: + build-tags: + - "-buildvcs=false" timeout: 10m issues: diff --git a/default-go-lint.mk b/default-go-lint.mk index f04ae20e..5bde084a 100644 --- a/default-go-lint.mk +++ b/default-go-lint.mk @@ -12,9 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - -GOLANG_CI_VER ?= v1.62.2 -GO_VERSION ?= 1.22.0 +GOLANG_CI_VER ?= v1.63.4 GIT_ROOT_DIR ?= $(dir $(lastword $(MAKEFILE_LIST))) include $(GIT_ROOT_DIR)/detect-container-runtime.mk @@ -23,7 +21,7 @@ include $(GIT_ROOT_DIR)/detect-container-runtime.mk lint: ## Run Go linter against the codebase ifeq ($(CONTAINER_RUNNABLE), 0) $(RUN_CONTAINER_COMMAND) docker.io/golangci/golangci-lint:${GOLANG_CI_VER}-alpine \ - golangci-lint run ./... -v --go=${GO_VERSION} + golangci-lint run ./... -v else - golangci-lint run ./... -v --go=${GO_VERSION} + golangci-lint run ./... -v endif diff --git a/operators/focom-operator/Makefile b/operators/focom-operator/Makefile index ecaf898c..258a87c6 100644 --- a/operators/focom-operator/Makefile +++ b/operators/focom-operator/Makefile @@ -5,9 +5,6 @@ include ../../default-gosec.mk include ../../default-go-lint.mk include ../../default-go-misc.mk -# Override golangci-lint target version -GO_VERSION = 1.23.5 - # VERSION defines the project version for the bundle. # Update this value when you upgrade the version of your project. # To re-generate a bundle for another specific version without changing the standard setup, you can: