Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ site/.hugo_build.lock
# goreleaser artifacts
**/dist/
/output/
Comment on lines 32 to 34
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# goreleaser artifacts
**/dist/
/output/

Seems like goreleaser isn't used anymore. Looks like it was removed in #5239

/_output/
23 changes: 13 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ MYGOBIN = $(shell go env GOBIN)
ifeq ($(MYGOBIN),)
MYGOBIN = $(shell go env GOPATH)/bin
endif
export PATH := $(MYGOBIN):$(PATH)
OUTPUT_DIR := $(CURDIR)/_output
export PATH := $(OUTPUT_DIR):$(MYGOBIN):$(PATH)

# Provide defaults for REPO_OWNER and REPO_NAME if not present.
# Typically these values would be provided by Prow.
Expand Down Expand Up @@ -69,14 +70,15 @@ $(MYGOBIN)/pluginator:

# --- Build targets ---

# Build from local source.
$(MYGOBIN)/kustomize: build-kustomize-api
cd kustomize && go install -ldflags \
# Build from local source into _output/.
$(OUTPUT_DIR)/kustomize: build-kustomize-api
mkdir -p $(OUTPUT_DIR)
cd kustomize && go build -o $(OUTPUT_DIR)/kustomize -ldflags \
"-X sigs.k8s.io/kustomize/api/provenance.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \
-X sigs.k8s.io/kustomize/api/provenance.version=$(shell git describe --tags --always --dirty)" \
.

kustomize: $(MYGOBIN)/kustomize
kustomize: $(OUTPUT_DIR)/kustomize

# Used to add non-default compilation flags when experimenting with
# plugin-to-api compatibility checks.
Expand Down Expand Up @@ -168,14 +170,15 @@ test-go-mod:
verify-kustomize-e2e: $(MYGOBIN)/mdrip $(MYGOBIN)/kind
( \
set -e; \
/bin/rm -f $(MYGOBIN)/kustomize; \
echo "Installing kustomize from ."; \
cd kustomize; go install .; cd ..; \
/bin/rm -f $(OUTPUT_DIR)/kustomize; \
echo "Building kustomize from ."; \
mkdir -p $(OUTPUT_DIR); \
cd kustomize; go build -o $(OUTPUT_DIR)/kustomize .; cd ..; \
./hack/testExamplesE2EAgainstKustomize.sh .; \
)

.PHONY:
test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip
test-examples-kustomize-against-HEAD: $(OUTPUT_DIR)/kustomize $(MYGOBIN)/mdrip
./hack/testExamplesAgainstKustomize.sh HEAD

.PHONY:
Expand All @@ -193,7 +196,7 @@ workspace-sync:
clean: clean-kustomize-external-go-plugin uninstall-tools
go clean --cache
rm -f $(builtinplugins)
rm -f $(MYGOBIN)/kustomize
rm -rf $(OUTPUT_DIR)

# Nuke the site from orbit. It's the only way to be sure.
.PHONY: nuke
Expand Down
Loading