diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 561c061..5ab2842 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,7 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.24 + go-version: 1.26 cache-dependency-path: | go.sum id: go diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index 463393e..a8708d5 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.github/workflows/e2e-test.yaml @@ -35,7 +35,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.24 + go-version: 1.26 cache-dependency-path: | go.sum id: go diff --git a/Dockerfile b/Dockerfile index c6c28db..046645c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ # under the License. # -FROM golang:1.24 AS build +FROM golang:1.26 AS build WORKDIR /e2e @@ -24,7 +24,7 @@ COPY . . RUN make linux -FROM golang:1.24 AS bin +FROM golang:1.26 AS bin COPY --from=build /e2e/bin/linux/e2e /usr/local/bin/e2e diff --git a/Makefile b/Makefile index 54fd69e..349ec68 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ all: clean lint test build .PHONY: lint lint: - $(GO_LINT) version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin -d "v2.1.6" + $(GO_LINT) version || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin -d "v2.11.4" $(GO_LINT) run -v ./... .PHONY: fix-lint diff --git a/go.mod b/go.mod index 449797e..def1f5b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/skywalking-infra-e2e -go 1.24 +go 1.26 require ( github.com/docker/docker v20.10.7+incompatible