Skip to content
Merged

d #306

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-image-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/call-lint-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-golang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/lint-license.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-spell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/development/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion docs/contributing/development/chart.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pkg/lock/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down