Skip to content

Commit

Permalink
Makefile: Remove test dependency on docker-build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
darkowlzz committed Oct 14, 2021
1 parent 911f186 commit fd79fac
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ jobs:
BUILD_PLATFORMS=linux/amd64 \
BUILD_ARGS="--cache-from=type=local,src=/tmp/.buildx-cache \
--cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max"
env:
KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
- # Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ generate: controller-gen
cd api; $(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..."

# Build the docker image
docker-build: test
docker-build:
docker buildx build \
--platform=$(BUILD_PLATFORMS) \
-t ${IMG} \
Expand Down

0 comments on commit fd79fac

Please sign in to comment.