Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

removing boilerplate test already replaced by project boiler check #1480

Merged
merged 1 commit into from
May 15, 2020
Merged
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,10 @@ jobs:
../project/script/validate/dco

# TODO: (mikebrow) removed test/ due to ltag not working with test/e3e symlink
# TODO: (mikebrow) removed hack/ due to prior boilerplate tests
- name: Headers
working-directory: src/github.com/containerd/cri
run: |
ltag -t "../project/script/validate/template" --excludes "vendor test hack" --check -v
ltag -t "../project/script/validate/template" --excludes "vendor test" --check -v

- name: Vendor
working-directory: src/github.com/containerd/cri
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ all: binaries
help: ## this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9._-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort

verify: lint gofmt boiler check-vendor ## execute the source code verification tools
verify: lint gofmt check-vendor ## execute the source code verification tools

version: ## print current cri plugin release version
@echo $(VERSION)
Expand All @@ -62,10 +62,6 @@ gofmt:
@echo "$(WHALE) $@"
@./hack/verify-gofmt.sh

boiler:
@echo "$(WHALE) $@"
@./hack/verify-boilerplate.sh

check-vendor:
@echo "$(WHALE) $@"
@./hack/verify-vendor.sh
Expand Down Expand Up @@ -209,7 +205,6 @@ install.tools: .install.gitvalidation .install.golangci-lint .install.vndr ## in
install-containerd \
release \
push \
boiler \
clean \
default \
gofmt \
Expand Down
2 changes: 1 addition & 1 deletion docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This document assumes you have already setup the development environment (go, gi

Before sending pull requests you should at least make sure your changes have passed code verification, unit, integration and CRI validation tests.
## Code Verification
Code verification includes lint, code formatting, boilerplate check etc.
Code verification includes lint, and code formatting check etc.
* Install tools used by code verification:
```bash
make install.tools
Expand Down
4 changes: 0 additions & 4 deletions hack/boilerplate/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions hack/boilerplate/BUILD

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,3 @@
See the License for the specific language governing permissions and
limitations under the License.
*/

package main
13 changes: 0 additions & 13 deletions hack/boilerplate/boilerplate.Dockerfile.txt

This file was deleted.

13 changes: 0 additions & 13 deletions hack/boilerplate/boilerplate.Makefile.txt

This file was deleted.

15 changes: 0 additions & 15 deletions hack/boilerplate/boilerplate.go.txt

This file was deleted.

242 changes: 0 additions & 242 deletions hack/boilerplate/boilerplate.py

This file was deleted.

13 changes: 0 additions & 13 deletions hack/boilerplate/boilerplate.py.txt

This file was deleted.

13 changes: 0 additions & 13 deletions hack/boilerplate/boilerplate.sh.txt

This file was deleted.

Loading