Skip to content

Commit 0a3e0c4

Browse files
Merge pull request #41 from stakater/update-pipeline
[skip-ci] Update golang ci lint version in pipeline
2 parents d282e30 + 8726518 commit 0a3e0c4

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ on:
88
env:
99
DOCKER_FILE_PATH: Dockerfile
1010
GOLANG_VERSION: 1.16
11-
KUBERNETES_VERSION: "1.18.0"
12-
KIND_VERSION: "0.7.0"
11+
KUBERNETES_VERSION: "1.20.2"
12+
KIND_VERSION: "0.10.0"
13+
GOLANG_CI_LINT_VERSION: v1.39.0
1314

1415
jobs:
1516
build:
@@ -30,7 +31,7 @@ jobs:
3031

3132
- name: Lint
3233
run: |
33-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.26.0
34+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${{ env.GOLANG_CI_LINT_VERSION }}
3435
golangci-lint run --timeout=10m ./...
3536
3637
- name: Install kubectl

.github/workflows/push.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ env:
1010
GOLANG_VERSION: 1.16
1111
OPERATOR_SDK_VERSION: "1.2.0"
1212
KUSTOMIZE_VERSION: "3.5.4"
13-
KUBERNETES_VERSION: "1.18.0"
14-
KIND_VERSION: "0.7.0"
13+
KUBERNETES_VERSION: "1.20.2"
14+
KIND_VERSION: "0.10.0"
15+
GOLANG_CI_LINT_VERSION: v1.39.0
1516

1617
jobs:
1718
build:
@@ -34,7 +35,7 @@ jobs:
3435

3536
- name: Lint
3637
run: |
37-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.26.0
38+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${{ env.GOLANG_CI_LINT_VERSION }}
3839
golangci-lint run --timeout=10m ./...
3940
4041
- name: Install kubectl

controllers/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestAPIs(t *testing.T) {
6161
}
6262

6363
var _ = BeforeSuite(func(done Done) {
64-
log = zap.LoggerTo(GinkgoWriter, true)
64+
log = zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter))
6565
logf.SetLogger(log)
6666

6767
By("bootstrapping test environment")

0 commit comments

Comments
 (0)