Skip to content

Commit fd79fac

Browse files
committed
Makefile: Remove test dependency on docker-build
Prevent running the tests twice in e2e workflow by removing the dependency on docker-build on test. Update e2e workflow to remove setting KUBEBUILDER_ASSETS needed to run tests from "Build container image" step. Signed-off-by: Sunny <darkowlzz@protonmail.com>
1 parent 911f186 commit fd79fac

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

.github/workflows/e2e.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ jobs:
7171
BUILD_PLATFORMS=linux/amd64 \
7272
BUILD_ARGS="--cache-from=type=local,src=/tmp/.buildx-cache \
7373
--cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max"
74-
env:
75-
KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
7674
- # Temp fix
7775
# https://github.com/docker/build-push-action/issues/252
7876
# https://github.com/moby/buildkit/issues/1896

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ generate: controller-gen
8686
cd api; $(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..."
8787

8888
# Build the docker image
89-
docker-build: test
89+
docker-build:
9090
docker buildx build \
9191
--platform=$(BUILD_PLATFORMS) \
9292
-t ${IMG} \

0 commit comments

Comments
 (0)