Skip to content

Commit

Permalink
fix:update go version and workflow files
Browse files Browse the repository at this point in the history
Signed-off-by: Parthib <parthibdutta02@gmail.com>
  • Loading branch information
ptdatta committed Sep 15, 2023
1 parent 8d29c3d commit efdc07e
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: 1.19.1
go-version: 1.21
- run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build .
docker:
name: Docker build and push
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@master
with:
go-version: 1.19
go-version: 1.21
- uses: actions/checkout@master
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: '1.19'
go-version: '1.21'
- run: GOPROXY=direct,https://proxy.golang.org GOSUMDB=off GO111MODULE=on go install -mod=mod github.com/kisielk/errcheck; /home/runner/go/bin/errcheck -tags draft ./...
error_code_check:
name: Error code utility check
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: 1.19
go-version: 1.21
- run: |
errWillHave="level=error"
GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil;
Expand All @@ -80,7 +80,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: 1.19
go-version: 1.21
- uses: dominikh/staticcheck-action@v1.2.0
with:
install-go: false
Expand All @@ -96,7 +96,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: '1.19'
go-version: '1.21'
- run: GOPROXY=direct,https://proxy.golang.org GOSUMDB=off GO111MODULE=on go vet -tags draft ./...
sec_check:
name: Security check
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: '1.19'
go-version: '1.21'
- name: Create cluster using KinD
uses: engineerd/setup-kind@v0.5.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/components-to-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
CopyComponents:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Make components to .md files
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-oam-defs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@master
with:
go-version: 1.19
go-version: 1.21
- name: Run adapter to create components
run: |
touch log.txt
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM golang:1.19 as build-env
FROM golang:1.21 as build-env
ARG VERSION
ARG GIT_COMMITSHA
WORKDIR /github.com/layer5io/meshery-osm
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include build/Makefile.show-help.mk
BUILDER=buildx-multi-arch
ADAPTER=osm

v ?= 1.19.1 # Default go version to be used
v ?= 1.21 # Default go version to be used


#-----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
GOVERSION = 1.21
GOPATH = $(shell go env GOPATH)
GOBIN = $(GOPATH)/bin

Expand Down

0 comments on commit efdc07e

Please sign in to comment.