diff --git a/LICENSE-AGE b/LICENSE-AGE deleted file mode 100644 index 7a0284b..0000000 --- a/LICENSE-AGE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright 2019 Google LLC - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google LLC nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Makefile b/Makefile index 3410402..6ef3e50 100644 --- a/Makefile +++ b/Makefile @@ -7,26 +7,15 @@ AGE_SYLR_REPO ?= https://github.com/sylr/age.git KUSTOMIZE_SRC ?= $(GOPATH)/src/sigs.k8s.io/kustomize/kustomize KUSTOMIZE_SYLR_REPO ?= https://github.com/sylr/kustomize.git -AGE_YAML_SUPPORT_COMMIT ?= d3cd2ad563ad35a349339e899a8ed39f7e29dc02 -KUSTOMIZE_AGE_SUPPORT_COMMIT ?= 8de35139bca2d568069daa089d4896146fba1426 +KUSTOMIZE_AGE_SUPPORT_COMMIT ?= b8dce3201b944037333374bf551b84954132e946 export GOPATH -.PHONY: all make-binaries age-git-reset kustomize-git-reset age-binaries kustomize-binaries +.PHONY: all make-binaries kustomize-git-reset kustomize-binary all: make-binaries -make-binaries: age-binaries kustomize-binaries - -$(AGE_SRC): - # mkdir -p $(shell dirname $(AGE_SRC)) - git clone $(AGE_SYLR_REPO) $(AGE_SRC) - -age-git-reset: $(AGE_SRC) - git -C "$(AGE_SRC)" remote add sylr $(AGE_SYLR_REPO) || true - git -C "$(AGE_SRC)" remote update - git -C "$(AGE_SRC)" rev-parse --verify kustomize-age || git -C "$(AGE_SRC)" checkout -b kustomize-age $(AGE_YAML_SUPPORT_COMMIT) - git -C "$(AGE_SRC)" rev-parse --verify kustomize-age && git -C "$(AGE_SRC)" checkout kustomize-age && git -C "$(AGE_SRC)" reset --hard $(AGE_YAML_SUPPORT_COMMIT) +make-binaries: kustomize-binary $(KUSTOMIZE_SRC): # mkdir -p $(shell dirname $(KUSTOMIZE_SRC)) @@ -38,18 +27,7 @@ kustomize-git-reset: git -C "$(KUSTOMIZE_SRC)/.." rev-parse --verify kustomize-age || git -C "$(KUSTOMIZE_SRC)/.." checkout -b kustomize-age $(KUSTOMIZE_AGE_SUPPORT_COMMIT) git -C "$(KUSTOMIZE_SRC)/.." rev-parse --verify kustomize-age && git -C "$(KUSTOMIZE_SRC)/.." checkout kustomize-age && git -C "$(KUSTOMIZE_SRC)/.." reset --hard $(KUSTOMIZE_AGE_SUPPORT_COMMIT) -age-binaries: age-git-reset $(AGE_SRC) - cd $(AGE_SRC); \ - for platform in $(PLATFORMS); do \ - GOOS=$$(cut -d / -f1 <<<$$platform); \ - GOARCH=$$(cut -d / -f2 <<<$$platform); \ - OUTPUT=$$(basename $$PWD)-$$GOOS-$$GOARCH-$$(git rev-parse --short=8 HEAD); \ - test "$$GOOS" == "windows" && OUTPUT=$${OUTPUT}.exe; \ - GOOS=$$GOOS GOARCH=$$GOARCH go build -ldflags="-s -w" -trimpath -o $$OUTPUT ./cmd/age; \ - cp $$OUTPUT $(CURDIR)/bin; \ - done - -kustomize-binaries: $(KUSTOMIZE_SRC) kustomize-git-reset +kustomize-binary: $(KUSTOMIZE_SRC) kustomize-git-reset cd $(KUSTOMIZE_SRC); \ for platform in $(PLATFORMS); do \ GOOS=$$(cut -d / -f1 <<<$$platform); \