remove go.* from e2e tests directory

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
docker · Dec 8, 2022 · cc247fd · cc247fd
1 parent a4ac6ab
commit cc247fd
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 1,331 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,7 +52,6 @@ jobs:
         target:
           - lint
           - validate-go-mod
-          - validate-modules
           - validate-headers
           - validate-docs
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -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

diff --git a/Makefile b/Makefile
@@ -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
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -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 = ["."]

diff --git a/e2e/go.mod b/e2e/go.mod