diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 4e6bffbd..2ec48d97 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build . docker: name: Docker build and push diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80a420f9..970f8c39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Setup go uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - name: Checkout repository uses: actions/checkout@master - name: Run Linters @@ -57,7 +57,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: 1.23.x + go-version: 1.25.x - name: Run unit tests run: go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic - name: Upload coverage to Codecov diff --git a/.github/workflows/error-ref-publisher.yaml b/.github/workflows/error-ref-publisher.yaml index c1ad4758..b69fc634 100644 --- a/.github/workflows/error-ref-publisher.yaml +++ b/.github/workflows/error-ref-publisher.yaml @@ -24,7 +24,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - name: Run utility run: | diff --git a/.github/workflows/update-oam-defs.yml b/.github/workflows/update-oam-defs.yml index 3b3327ff..c1483422 100644 --- a/.github/workflows/update-oam-defs.yml +++ b/.github/workflows/update-oam-defs.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - name: Run adapter to create components run: | touch log.txt diff --git a/Dockerfile b/Dockerfile index 0feda2f4..ea1f83fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23 as build-env +FROM golang:1.25 AS build-env ENV CGO_ENABLED=0 ARG VERSION ARG GIT_COMMITSHA diff --git a/build/Makefile.core.mk b/build/Makefile.core.mk index 5bd0746b..6b7d4891 100644 --- a/build/Makefile.core.mk +++ b/build/Makefile.core.mk @@ -19,7 +19,7 @@ GIT_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`) GIT_COMMITSHA = $(shell git rev-list -1 HEAD) GIT_STRIPPED_VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1` | cut -c 2-) -GOVERSION = 1.23 +GOVERSION = 1.25 GOPATH = $(shell go env GOPATH) GOBIN = $(GOPATH)/bin diff --git a/go.mod b/go.mod index 56f82188..56037caa 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,8 @@ module github.com/layer5io/meshery-linkerd -go 1.23 -toolchain go1.24.1 +go 1.25 + +toolchain go1.25.0 replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334