From aaa2f6f8d775b89f3ffe253999b36c0a6f873b26 Mon Sep 17 00:00:00 2001 From: Nic Cope Date: Wed, 15 May 2024 15:14:25 -0700 Subject: [PATCH 1/3] Use crossplane/build submodule Signed-off-by: Nic Cope --- .gitmodules | 2 +- build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 921d31e3c5..960e4cbe95 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/build b/build index 4dc5a52567..231258db28 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 4dc5a5256743d1782b88cc6892e600281837750a +Subproject commit 231258db281237379d8ec0c6e4af9d7c1ae5cc4a From f9f55761a631ec1bfe0bbf32d02dee9653162cb2 Mon Sep 17 00:00:00 2001 From: Nic Cope Date: Wed, 15 May 2024 15:47:46 -0700 Subject: [PATCH 2/3] Add aliases for module Make targets I updated these target names in the build submodules, since they're not really vendoring anything anymore (that name predates Go modules). This alias works around the need to update CI definitions in a different repo. Signed-off-by: Nic Cope --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 5e02508ab9..0899798f89 100644 --- a/Makefile +++ b/Makefile @@ -370,3 +370,7 @@ delete-build-tags: @EXTRA_BUILDTAGGER_ARGS="--delete" RESTORE_DEEPCOPY_TAGS="true" ./scripts/tag.sh || $(FAIL) @$(OK) Untagging source files. endif + +# TODO(negz): Update CI to use these targets. +vendor: modules.download +vendor.check: modules.check From 38fe2713d08cdc912812a2b69b7c51da2a99c64b Mon Sep 17 00:00:00 2001 From: Nic Cope Date: Wed, 15 May 2024 15:54:18 -0700 Subject: [PATCH 3/3] Specify CROSSPLANE_VERSION, not UXP_VERSION The crossplane/build submodule no longer uses UXP. Signed-off-by: Nic Cope --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0899798f89..51315a554d 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ UP_CHANNEL = stable UPTEST_VERSION = v0.11.1 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)