From be4e93e743466cc2dd735b214c3243e351e1f63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 27 Jun 2024 16:56:03 +0200 Subject: [PATCH 1/3] chore: add support for codeowners --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..ea229aa --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @yfodil From 274ac6d63f19d5a3b33102477ff2e898234f293d Mon Sep 17 00:00:00 2001 From: Yacine FODIL Date: Fri, 28 Jun 2024 11:25:02 +0200 Subject: [PATCH 2/3] update build submodule --- .github/workflows/ci.yml | 10 +++++----- .gitmodules | 2 +- Makefile | 7 +++++-- build | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48e337d..7d11f7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: restore-keys: ${{ runner.os }}-build-lint- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check # We could run 'make lint' but we prefer this action because it leaves # 'annotations' (i.e. it comments on PRs to point out linter violations). @@ -105,7 +105,7 @@ jobs: restore-keys: ${{ runner.os }}-build-check-diff- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Check Diff run: make check-diff @@ -138,7 +138,7 @@ jobs: restore-keys: ${{ runner.os }}-build-unit-tests- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Run Unit Tests run: make -j2 test @@ -177,7 +177,7 @@ jobs: restore-keys: ${{ runner.os }}-build-unit-tests- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Deploying locally built provider package run: make local-deploy @@ -232,7 +232,7 @@ jobs: restore-keys: ${{ runner.os }}-build-publish-artifacts- - name: Vendor Dependencies - run: make vendor vendor.check + run: make modules.download modules.check - name: Build Artifacts run: make -j2 build.all diff --git a/.gitmodules b/.gitmodules index c2fad47..8f84209 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "build"] path = build - url = https://github.com/upbound/build + url = https://github.com/crossplane/build diff --git a/Makefile b/Makefile index 1a61667..555cb6e 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,9 @@ GO_SUBDIRS += cmd internal apis # Setup Kubernetes tools KIND_VERSION = v0.15.0 -UP_VERSION = v0.14.0 +UP_VERSION = v0.31.0 UP_CHANNEL = stable -UPTEST_VERSION = v0.2.1 +UPTEST_VERSION = v0.12.0 -include build/makelib/k8s_tools.mk # ==================================================================================== @@ -199,3 +199,6 @@ crossplane.help: help-special: crossplane.help .PHONY: crossplane.help help-special + +vendor: modules.download +vendor.check: modules.check \ No newline at end of file diff --git a/build b/build index 7da2fde..c40a953 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 7da2fdeb3dc1ebbce8210a58616debe34ef0fd97 +Subproject commit c40a953a4e49fbeff593861e6b723acc3989b244 From 735d84f3f2a9a07368842bd8a22dc8b2d1333e20 Mon Sep 17 00:00:00 2001 From: Yacine FODIL Date: Fri, 28 Jun 2024 11:35:29 +0200 Subject: [PATCH 3/3] set crossplane version --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 555cb6e..762b616 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,12 @@ GO_SUBDIRS += cmd internal apis # ==================================================================================== # Setup Kubernetes tools -KIND_VERSION = v0.15.0 +KIND_VERSION = v0.23.0 UP_VERSION = v0.31.0 UP_CHANNEL = stable UPTEST_VERSION = v0.12.0 -include build/makelib/k8s_tools.mk +CROSSPLANE_VERSION = 1.16.0 # ==================================================================================== # Setup Images