From 1afe35fa9b900a55d6b56d11e92f1da94bd42d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Thu, 30 May 2024 15:10:14 +0300 Subject: [PATCH] Use crossplane/build submodule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- .gitmodules | 2 +- Makefile | 6 +++++- build | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 921d31e3c..960e4cbe9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,4 @@ [submodule "build"] path = build - url = https://github.com/upbound/build + url = https://github.com/crossplane/build diff --git a/Makefile b/Makefile index 9e0eb0c5f..0b0ca3d76 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ UPTEST_LOCAL_VERSION = v0.12.0-9.gac371c9 UPTEST_LOCAL_CHANNEL = main KUSTOMIZE_VERSION = v5.3.0 YQ_VERSION = v4.40.5 -UXP_VERSION = 1.14.6-up.1 +CROSSPLANE_VERSION = 1.14.6 export UP_VERSION := $(UP_VERSION) export UP_CHANNEL := $(UP_CHANNEL) @@ -382,3 +382,7 @@ kustomize-crds: output.init $(KUSTOMIZE) $(YQ) @$(OK) Kustomizing CRDs. .PHONY: kustomize-crds + +# TODO(negz): Update CI to use these targets. +vendor: modules.download +vendor.check: modules.check diff --git a/build b/build index 75a9fe3ae..b0dfb8fbe 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 75a9fe3ae6b6de82c5f7ddc6a267617940f16b83 +Subproject commit b0dfb8fbe8c626e3e0f0b6efdfac926d750adf48