More makefile cleanup

This commit is contained in:
Katrina Verey
2022-04-05 14:31:17 -04:00
parent f68a0c50d9
commit c071cdaedd
2 changed files with 5 additions and 16 deletions

View File

@@ -92,7 +92,7 @@ jobs:
env: env:
KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet KUSTOMIZE_DOCKER_E2E: false # docker on windows not working well yet
# TODO: replace specific modules above with this once Windows tests are passing. # TODO (#4001): replace specific modules above with this once Windows tests are passing.
#- name: Test all modules #- name: Test all modules
# run: make test-unit-non-plugin # run: make test-unit-non-plugin
# env: # env:

View File

@@ -3,7 +3,6 @@
# #
# Makefile for kustomize CLI and API. # Makefile for kustomize CLI and API.
MODULES := '"cmd/config" "api/" "kustomize/" "kyaml/"'
LATEST_V4_RELEASE=v4.5.4 LATEST_V4_RELEASE=v4.5.4
SHELL := /usr/bin/env bash SHELL := /usr/bin/env bash
@@ -96,7 +95,9 @@ generate-kustomize-api:
verify-kustomize: \ verify-kustomize: \
install-tools \ install-tools \
lint-kustomize \ lint-kustomize \
test-unit-kustomize-all \ test-unit-kustomize-api \
test-unit-kustomize-cli \
test-unit-kustomize-plugins \
test-examples-kustomize-against-HEAD \ test-examples-kustomize-against-HEAD \
test-examples-kustomize-against-v4-release test-examples-kustomize-against-v4-release
@@ -123,21 +124,15 @@ check-license: $(MYGOBIN)/addlicense
lint: $(MYGOBIN)/golangci-lint $(MYGOBIN)/goimports $(builtinplugins) lint: $(MYGOBIN)/golangci-lint $(MYGOBIN)/goimports $(builtinplugins)
./hack/for-each-module.sh "make lint" ./hack/for-each-module.sh "make lint"
.PHONY: lint-kustomize
lint-kustomize: $(MYGOBIN)/golangci-lint $(builtinplugins)
cd api; $(MAKE) lint
cd kustomize; $(MAKE) lint
cd cmd/pluginator; $(MAKE) lint
.PHONY: test-unit-all .PHONY: test-unit-all
test-unit-all: $(builtinplugins) test-unit-all: $(builtinplugins)
./hack/for-each-module.sh "make test" ./hack/for-each-module.sh "make test"
# This target is used by our Github Actions CI to run unit tests for all non-plugin modules in multiple GOOS environments.
.PHONY: test-unit-non-plugin .PHONY: test-unit-non-plugin
test-unit-non-plugin: test-unit-non-plugin:
./hack/for-each-module.sh "make test" "./plugin/*" 15 ./hack/for-each-module.sh "make test" "./plugin/*" 15
# This target is used by our Github Actions CI to run unit tests for all non-plugin modules in multiple GOOS environments.
.PHONY: build-non-plugin-all .PHONY: build-non-plugin-all
build-non-plugin-all: build-non-plugin-all:
./hack/for-each-module.sh "make build" "./plugin/*" 15 ./hack/for-each-module.sh "make build" "./plugin/*" 15
@@ -154,12 +149,6 @@ test-unit-kustomize-plugins:
test-unit-kustomize-cli: test-unit-kustomize-cli:
cd kustomize; $(MAKE) test cd kustomize; $(MAKE) test
.PHONY: test-unit-kustomize-all
test-unit-kustomize-all: \
test-unit-kustomize-api \
test-unit-kustomize-cli \
test-unit-kustomize-plugins
test-unit-kyaml-all: test-unit-kyaml-all:
./hack/kyaml-pre-commit.sh ./hack/kyaml-pre-commit.sh