From 895f23891aa24f4e7431e74bd5fdf51e4a7a6db9 Mon Sep 17 00:00:00 2001 From: "weizhou.lan@daocloud.io" Date: Tue, 19 Apr 2022 00:02:56 +0800 Subject: [PATCH 1/3] d Signed-off-by: weizhou.lan@daocloud.io --- docs/contributing/development/chart.md | 2 +- pkg/lock/lock.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing/development/chart.md b/docs/contributing/development/chart.md index bc6293b3..d7899170 100644 --- a/docs/contributing/development/chart.md +++ b/docs/contributing/development/chart.md @@ -5,7 +5,7 @@ the '/' of branch 'github_pages' is used as github page each version of chart package will be automatically created by CI, they will be pushed to '/chart' of branch 'github_pages'. -the '/index.yaml' of branch 'github_pages' will also be updated by CI. +the '/index.yaml' of branch 'github_pages' will also be updated by CI. so, you could use following command to get the chart diff --git a/pkg/lock/lock.go b/pkg/lock/lock.go index d7f6247a..32c00cab 100644 --- a/pkg/lock/lock.go +++ b/pkg/lock/lock.go @@ -4,7 +4,7 @@ package lock // RWMutex is equivalent to sync.RWMutex but applies deadlock detection if the // built tag "lockdebug" is set -type RWMutex struct { +type RWMutex struct { internalRWMutex } From df147e08d878383335e7064867654c647e5db0e8 Mon Sep 17 00:00:00 2001 From: "weizhou.lan@daocloud.io" Date: Tue, 19 Apr 2022 00:04:14 +0800 Subject: [PATCH 2/3] d Signed-off-by: weizhou.lan@daocloud.io --- docs/contributing/development/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing/development/changelog.md b/docs/contributing/development/changelog.md index 4f71eac9..bd4e14e2 100644 --- a/docs/contributing/development/changelog.md +++ b/docs/contributing/development/changelog.md @@ -8,7 +8,7 @@ the changelog content include: -(1) New Features: it include all PR labelled with "pr/release/feature-new" +(1) New Features: it include all PR labelled with "pr/release/feature-new" (2) Changed Features: it include all PR labelled with "pr/release/feature-changed" From 1575cfd3a5765bd3163ec0eec65495c388f9e873 Mon Sep 17 00:00:00 2001 From: "weizhou.lan@daocloud.io" Date: Tue, 19 Apr 2022 00:17:35 +0800 Subject: [PATCH 3/3] d Signed-off-by: weizhou.lan@daocloud.io --- .github/workflows/build-image-ci.yaml | 2 +- .github/workflows/call-lint-chart.yaml | 2 +- .github/workflows/lint-golang.yaml | 2 +- .github/workflows/lint-license.yaml | 5 +++++ .github/workflows/lint-spell.yaml | 2 +- Makefile | 4 ++-- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-image-ci.yaml b/.github/workflows/build-image-ci.yaml index 01a7d69e..2b0c3a10 100644 --- a/.github/workflows/build-image-ci.yaml +++ b/.github/workflows/build-image-ci.yaml @@ -131,7 +131,7 @@ jobs: echo ::set-output name=push::${{ inputs.push }} elif ${{ github.event_name == 'push' }} ; then echo "trigger by push" - echo ::set-output name=tag::${{ github.sha }} + echo ::set-output name=tag::${{ github.event.push.after }} echo ::set-output name=push::false elif ${{ github.event_name == 'pull_request_target' }} ; then echo "trigger by pull_request_target" diff --git a/.github/workflows/call-lint-chart.yaml b/.github/workflows/call-lint-chart.yaml index b2ab1d97..bcb7d25c 100644 --- a/.github/workflows/call-lint-chart.yaml +++ b/.github/workflows/call-lint-chart.yaml @@ -38,7 +38,7 @@ jobs: echo ::set-output name=ref::${{ github.event.inputs.ref }} elif ${{ github.event_name == 'pull_request' }} ; then echo "trigger by pull_request" - echo ::set-output name=ref::${{ github.sha }} + echo ::set-output name=ref::${{ github.event.pull_request.head.sha }} else echo "error, trigger by unknown event ${{ github.event_name }}" exit 1 diff --git a/.github/workflows/lint-golang.yaml b/.github/workflows/lint-golang.yaml index 5a1a3820..4155d7c3 100644 --- a/.github/workflows/lint-golang.yaml +++ b/.github/workflows/lint-golang.yaml @@ -60,7 +60,7 @@ jobs: if ${{ github.event_name == 'push' }} ; then echo "trigger by push" echo "::set-output name=check::true" - echo "::set-output name=ref::${{ github.sha }}" + echo "::set-output name=ref::${{ github.event.push.after }}" elif ${{ github.event_name == 'pull_request' }} ; then echo "trigger by pull_request" flag=${{ steps.filter_pr.outputs.src }} diff --git a/.github/workflows/lint-license.yaml b/.github/workflows/lint-license.yaml index be359f63..7518b113 100644 --- a/.github/workflows/lint-license.yaml +++ b/.github/workflows/lint-license.yaml @@ -37,6 +37,11 @@ jobs: if ${{ github.event_name == 'workflow_dispatch' }}; then tag_name=${{ github.event.inputs.ref }} echo ::set-output name=ref::${tag_name} + elif ${{ github.event_name == 'push' }} ; then + echo ::set-output name=ref::${{ github.event.push.after }} + elif ${{ github.event_name == 'pull_request' }} ; then + echo "trigger by pull_request_target" + echo ::set-output name=tag::${{ github.event.pull_request.head.sha }} else echo ::set-output name=ref::${{ github.sha }} fi diff --git a/.github/workflows/lint-spell.yaml b/.github/workflows/lint-spell.yaml index f826f13a..1c0b6e4b 100644 --- a/.github/workflows/lint-spell.yaml +++ b/.github/workflows/lint-spell.yaml @@ -37,7 +37,7 @@ jobs: echo "trigger by workflow_dispatch" echo ::set-output name=ref::${{ github.event.inputs.ref }} elif ${{ github.event_name == 'push' }} ; then - echo "trigger by ${{ github.event_name }}" + echo "trigger by push" echo ::set-output name=ref::${{ github.event.push.after }} else echo "trigger by ${{ github.event_name }}" diff --git a/Makefile b/Makefile index 6140f8a3..3f05112e 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ lint-markdown-spell: if which mdspell &>/dev/null ; then \ mdspell -r --en-us --ignore-numbers --target-relative .github/.spelling --ignore-acronyms '**/*.md' '!vendor/**/*.md' ; \ else \ - docker run --rm -it \ + docker run --rm \ --entrypoint bash -v $(ROOT_DIR):/workdir $(IMAGE) \ -c "cd /workdir ; mdspell -r --en-us --ignore-numbers --target-relative .github/.spelling --ignore-acronyms '**/*.md' '!vendor/**/*.md' " ; \ fi @@ -89,7 +89,7 @@ lint-code-spell: $(QUIET) if which codespell &> /dev/null ; then \ codespell --config .github/codespell-config ;\ else \ - docker run --rm -it \ + docker run --rm \ --entrypoint bash -v $(ROOT_DIR):/workdir $(IMAGE) \ -c "cd /workdir ; codespell --config .github/codespell-config " ; \ fi