diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b7a7cf..7383217 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x cache: true cache-dependency-path: go.sum - uses: actions/checkout@master @@ -29,7 +29,7 @@ jobs: - name: set up Go uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x cache: true cache-dependency-path: go.sum - uses: actions/checkout@master @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x cache: true cache-dependency-path: go.sum - name: Run unit tests @@ -70,7 +70,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.21.x + go-version: 1.23.x cache: true cache-dependency-path: go.sum - run: make gobuild diff --git a/.github/workflows/update-oam-defs.yml b/.github/workflows/update-oam-defs.yml index 0a1ab6a..747fd46 100644 --- a/.github/workflows/update-oam-defs.yml +++ b/.github/workflows/update-oam-defs.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.23 - name: Run adapter to create components run: | touch log.txt diff --git a/Dockerfile b/Dockerfile index e657ed6..8765860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 as builder +FROM golang:1.23 as builder ARG VERSION ARG GIT_COMMITSHA diff --git a/build/Makefile.core.mk b/build/Makefile.core.mk index 7bb7627..9cf4477 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.19 +GOVERSION = 1.23 GOPATH = $(shell go env GOPATH) GOBIN = $(GOPATH)/bin diff --git a/go.mod b/go.mod index 42d0090..b0e121f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/layer5io/meshery-consul -go 1.21 +go 1.23 replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334