diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e30504..492294e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} - run: GOPROXY=direct GOSUMDB=off go get -u golang.org/x/lint/golint; go list ./istio/... | grep -v /vendor/ | xargs -L1 /home/runner/go/bin/golint -set_exit_status @@ -31,7 +31,7 @@ jobs: with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u github.com/kisielk/errcheck; /home/runner/go/bin/errcheck -tags draft ./... @@ -44,7 +44,7 @@ jobs: with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u honnef.co/go/tools/cmd/staticcheck; /home/runner/go/bin/staticcheck -tags draft -checks all ./istio/... # https://staticcheck.io/docs/checks diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml index ee7381f..134d655 100644 --- a/.github/workflows/multi-platform.yml +++ b/.github/workflows/multi-platform.yml @@ -49,7 +49,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Identify Release Values if: "${{ github.event.inputs.release-ver}} != 'v' }}" diff --git a/Dockerfile b/Dockerfile index a6bf652..7982e2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17 as bd +FROM golang:1.21 as bd ARG VERSION ARG GIT_COMMITSHA diff --git a/Makefile b/Makefile index 3aa1b28..ce03b6d 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ docker-run: layer5/meshery-cpx run: - go mod tidy; \ + go$(v) mod tidy; \ DEBUG=true GOPROXY=direct GOSUMDB=off go run main.go error: diff --git a/go.mod b/go.mod index 3b53be2..196d533 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/layer5io/meshery-cpx -go 1.13 +go 1.21 require ( github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect