Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove go.* from e2e tests directory #10059

Merged
merged 1 commit into from
Dec 8, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ jobs:
target:
- lint
- validate-go-mod
- validate-modules
- validate-headers
- validate-docs
steps:
Expand Down
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ RUN --mount=type=bind,target=.,rw <<EOT
fi
EOT

FROM vendored AS modules-validate
RUN apk add --no-cache bash
RUN apk add --no-cache jq
RUN --mount=type=bind,target=.,rw ./verify-go-modules.sh e2e

FROM build-base AS build
ARG BUILD_TAGS
ARG TARGETPLATFORM
Expand Down
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,7 @@ go-mod-tidy: ## Run go mod tidy in a container and output resulting go.mod and g
validate-go-mod: ## Validate go.mod and go.sum are up-to-date
$(BUILDX_CMD) bake vendor-validate

.PHONY: validate-modules
validate-modules: ## Validate root and e2e go.mod are synced
$(BUILDX_CMD) bake modules-validate

validate: validate-go-mod validate-modules validate-headers validate-docs ## Validate sources
validate: validate-go-mod validate-headers validate-docs ## Validate sources

pre-commit: validate check-dependencies lint build test e2e-compose

Expand Down
8 changes: 1 addition & 7 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,7 @@ target "vendor-validate" {
output = ["type=cacheonly"]
}

target "modules-validate" {
inherits = ["_common"]
target = "modules-validate"
output = ["type=cacheonly"]
}

target "vendor" {
target "vendor-update" {
inherits = ["_common"]
target = "vendor-update"
output = ["."]
Expand Down
170 changes: 0 additions & 170 deletions e2e/go.mod

This file was deleted.