Skip to content

Commit

Permalink
Bump go, linter and cl-common versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ilija42 committed Dec 2, 2024
1 parent 0194d70 commit a4bb6c4
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 306 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ccip-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: ['1.22.5']
go-version: ['1.23.3']
steps:
- name: Checkout the chainlink-ccip repo
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ccip-ocr3-build-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
go-version: ['1.22']
go-version: ['1.23.3']
defaults:
run:
working-directory: .
Expand All @@ -27,7 +27,7 @@ jobs:
run: make
- name: Install linter
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.0
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.62.2
- name: Run linter
run: make lint
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
go-version: ['1.22']
go-version: ['1.23.3']
defaults:
run:
working-directory: .
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test: ensure_go_version
go test -race -fullpath -shuffle on -count $(TEST_COUNT) -coverprofile=$(COVERAGE_FILE) \
`go list ./... | grep -Ev 'chainlink-ccip/internal/mocks|chainlink-ccip/mocks|chainlink-ccip/commit/merkleroot/rmn/rmnpb'`

lint: ensure_go_version ensure_golangcilint_1_59
lint: ensure_go_version ensure_golangcilint_1_62_2
golangci-lint run -c .golangci.yml

checks: test lint
Expand All @@ -57,13 +57,13 @@ install-protoc:
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31

install-golangcilint:
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2

ensure_go_version:
@go version | grep -q 'go1.22' || (echo "Please use go1.22" && exit 1)
@go version | grep -q 'go1.23.3' || (echo "Please use go1.23.3" && exit 1)

ensure_golangcilint_1_59:
@golangci-lint --version | grep -q '1.59' || (echo "Please use golangci-lint 1.59" && exit 1)
ensure_golangcilint_1_62_2:
@golangci-lint --version | grep -q ' 1.62.2' || (echo "Please use golangci-lint 1.62.2" && exit 1)

ensure_protoc_28_0:
@$(PROTOC_BIN) --version | grep -q 'libprotoc 28.0' || (echo "Please use protoc 28.0, (make install-protoc)" && exit 1)
Loading

0 comments on commit a4bb6c4

Please sign in to comment.