Merge pull request #758 from turkenf/change-submodule

Use crossplane/build submodule
crossplane-contrib · Jun 26, 2024 · ade234d · ade234d
2 parents c567e11 + 45785d4
commit ade234d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -84,7 +84,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)
@@ -366,4 +366,8 @@ delete-build-tags:
 	@$(INFO) Untagging source files.
 	@EXTRA_BUILDTAGGER_ARGS="--delete" RESTORE_DEEPCOPY_TAGS="true" ./scripts/tag.sh || $(FAIL)
 	@$(OK) Untagging source files.
-endif
+endif
+
+# TODO(negz): Update CI to use these targets.
+vendor: modules.download
+vendor.check: modules.check
diff --git a/build b/build
+0 −11		CODEOWNERS
+19 −16		README.md
+0 −91		common.sh
+0 −102		cross/Dockerfile
+0 −36		cross/Makefile
+0 −51		cross/rsyncd.sh
+0 −34		cross/run.sh
+0 −29		cross/xvfb-chrome
+12 −6		makelib/controlplane.mk
+0 −74		makelib/docs.mk
+18 −148		makelib/golang.mk
+0 −301		makelib/image.mk
+26 −22		makelib/k8s_tools.mk
+0 −185		makelib/local.mk
+6 −3		makelib/local.xpkg.mk
+0 −94		makelib/nodejs.mk
+1 −0		makelib/xpkg.mk
+0 −76		makelib/yarnjs.mk
+0 −30		reset
+0 −175		run
+0 −46		scripts/load-configs.sh
+0 −165		scripts/localdev-deploy-component.sh
+0 −135		scripts/localdev-prepare.sh
+0 −36		scripts/localdev-remove-component.sh
+0 −87		scripts/localdev-scaffold.sh
+0 −61		scripts/utils.sh