Skip to content

Commit

Permalink
Merge pull request #232 from amorenoz/fix_1.18
Browse files Browse the repository at this point in the history
Makefile: fix support for golang 1.18
  • Loading branch information
eranra authored Jun 26, 2022
2 parents 2f2db65 + 9530b6b commit 2011d0a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.17']
go: ['1.17', '1.18']

steps:
- name: install make
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.17']
go: ['1.17', '1.18']

steps:
- name: install make
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ validate_go:
lint: $(GOLANGCI_LINT) ## Lint the code
@go mod vendor
@current_ver=$$(go version | { read _ _ v _; echo $${v#go}; }); \
if [[ "$$current_ver" == *"1.18."* ]]; then echo "Linting is not fully supported for golang 1.18. Consider using golang 1.17";\
if [[ "$$current_ver" == *"1.18"* ]]; then echo "Linting is not fully supported for golang 1.18. Consider using golang 1.17";\
$(GOLANGCI_LINT) run --disable-all --enable goimports --enable gofmt --enable ineffassign --timeout 5m; else \
$(GOLANGCI_LINT) run --enable goimports --timeout 5m; \
fi
Expand Down

0 comments on commit 2011d0a

Please sign in to comment.