From c3ce53ddd66ad5c17a5fe60f7cf31cceef74dcf5 Mon Sep 17 00:00:00 2001 From: kv Date: Fri, 4 Sep 2020 09:57:46 +0800 Subject: [PATCH] fix: lint ci will run in pr phase --- .github/workflows/ci.yml | 1 - .github/workflows/golangci-lint.yml | 2 ++ pkg/dp/apisix/model.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cb31d6..efeaabb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - kv/ci pull_request: branches: - master diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 2ce8406..41ea04f 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -5,6 +5,8 @@ on: - master - ci/* # a temporary branch to check CI can be named with 'ci/...' pull_request: + branches: + - master jobs: golangci: name: lint diff --git a/pkg/dp/apisix/model.go b/pkg/dp/apisix/model.go index 093d18d..74430a2 100644 --- a/pkg/dp/apisix/model.go +++ b/pkg/dp/apisix/model.go @@ -40,7 +40,7 @@ type Upstream struct { ResourceVersion *string `json:"resource_version,omitempty"` Name *string `json:"name,omitempty"` Type *string `json:"type,omitempty"` - HashOn *string `json:"hash_on,omitemtpy"` + HashOn *string `json:"hash_on,omitempty"` Key *string `json:"key,omitempty"` Nodes []*Node `json:"nodes,omitempty"` FromKind *string `json:"from_kind,omitempty"`