Skip to content

Commit 2011d0a

Browse files
authored
Merge pull request #232 from amorenoz/fix_1.18
Makefile: fix support for golang 1.18
2 parents 2f2db65 + 9530b6b commit 2011d0a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
go: ['1.17']
15+
go: ['1.17', '1.18']
1616

1717
steps:
1818
- name: install make

.github/workflows/pull_request_e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
go: ['1.17']
15+
go: ['1.17', '1.18']
1616

1717
steps:
1818
- name: install make

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ validate_go:
6767
lint: $(GOLANGCI_LINT) ## Lint the code
6868
@go mod vendor
6969
@current_ver=$$(go version | { read _ _ v _; echo $${v#go}; }); \
70-
if [[ "$$current_ver" == *"1.18."* ]]; then echo "Linting is not fully supported for golang 1.18. Consider using golang 1.17";\
70+
if [[ "$$current_ver" == *"1.18"* ]]; then echo "Linting is not fully supported for golang 1.18. Consider using golang 1.17";\
7171
$(GOLANGCI_LINT) run --disable-all --enable goimports --enable gofmt --enable ineffassign --timeout 5m; else \
7272
$(GOLANGCI_LINT) run --enable goimports --timeout 5m; \
7373
fi

0 commit comments

Comments
 (0)