Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chores: Update build submodule and up up cli version #2067

Merged
merged 3 commits into from
Jul 24, 2024
Merged

chores: Update build submodule and up up cli version #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f41584c
chores: Update build submodule and up up cli version
ChristianAvila Jun 9, 2024
992b1b1
chores: Use the updated command to manage go dependencies
ChristianAvila Jun 13, 2024
8fa522d
chores: Install goimports and use HELM as command
ChristianAvila Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
# Common versions
GO_VERSION: '1.21.2'
GOLANGCI_VERSION: 'v1.54.2'
DOCKER_BUILDX_VERSION: 'v0.10.0'
DOCKER_BUILDX_VERSION: 'v0.14.1'

# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
# a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether
Expand All @@ -35,6 +35,9 @@ jobs:
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
go-version: ${{ env.GO_VERSION }}

- name: Install goimports
run: go install golang.org/x/tools/cmd/goimports

- name: Find the Go Build Cache
id: go
Expand All @@ -55,7 +58,7 @@ jobs:
restore-keys: ${{ runner.os }}-pkg-

- name: Vendor Dependencies
run: make vendor vendor.check
run: make modules.download modules.check

- name: Check Diff
run: make check-diff
Expand Down Expand Up @@ -132,7 +135,7 @@ jobs:
restore-keys: ${{ runner.os }}-pkg-

- name: Vendor Dependencies
run: make vendor vendor.check
run: make modules.download modules.check

# We could run 'make lint' to ensure our desired Go version, but we prefer
# this action because it leaves 'annotations' (i.e. it comments on PRs to
Expand Down Expand Up @@ -248,7 +251,7 @@ jobs:
restore-keys: ${{ runner.os }}-pkg-

- name: Vendor Dependencies
run: make vendor vendor.check
run: make modules.download modules.check

- name: Run Unit Tests
run: make -j2 test
Expand Down Expand Up @@ -308,7 +311,7 @@ jobs:
${{ runner.os }}-pkg-

- name: Vendor Dependencies
run: make vendor vendor.check
run: make modules.download modules.check

- name: Build Helm Chart
run: make -j2 build
Expand Down Expand Up @@ -379,7 +382,7 @@ jobs:
restore-keys: ${{ runner.os }}-pkg-

- name: Vendor Dependencies
run: make vendor vendor.check
run: make modules.download modules.check

- name: Build Artifacts
run: make -j2 build.all
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "build"]
path = build
url = https://github.com/upbound/build
url = https://github.com/crossplane/build
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ GOLANGCILINT_VERSION = 1.54.2
# ====================================================================================
# Setup Kubernetes tools

UP_VERSION = v0.18.0
UP_VERSION = v0.27.0
UP_CHANNEL = stable
UPTEST_VERSION = v0.5.0
UPTEST_VERSION = v0.12.0

-include build/makelib/k8s_tools.mk

Expand Down Expand Up @@ -101,7 +101,7 @@ manifests:
e2e.run: test-integration

# Run integration tests.
test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM3)
test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM)
@$(INFO) running integration tests using kind $(KIND_VERSION)
@KIND_NODE_IMAGE_TAG=${KIND_NODE_IMAGE_TAG} $(ROOT_DIR)/cluster/local/integration_tests.sh || $(FAIL)
@$(OK) integration tests passed
Expand Down
2 changes: 1 addition & 1 deletion build
Open in desktop
Submodule build updated 27 files
+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
+13 −7 makelib/controlplane.mk
+0 −74 makelib/docs.mk
+18 −148 makelib/golang.mk
+0 −301 makelib/image.mk
+51 −22 makelib/k8s_tools.mk
+0 −185 makelib/local.mk
+6 −3 makelib/local.xpkg.mk
+0 −94 makelib/nodejs.mk
+5 −0 makelib/output.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
4 changes: 2 additions & 2 deletions cluster/local/integration_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ echo "${PVC_YAML}" | "${KUBECTL}" create -f -

# install crossplane from stable channel
echo_step "installing crossplane from stable channel"
"${HELM3}" repo add crossplane-stable https://charts.crossplane.io/stable/
"${HELM}" repo add crossplane-stable https://charts.crossplane.io/stable/
chart_version="1.14.5"
echo_info "using crossplane version ${chart_version}"
echo
# we replace empty dir with our PVC so that the /cache dir in the kind node
# container is exposed to the crossplane pod
"${HELM3}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version ${chart_version} --wait --set packageCache.pvc=package-cache
"${HELM}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version ${chart_version} --wait --set packageCache.pvc=package-cache

# ----------- integration tests
echo_step "--- INTEGRATION TESTS ---"
Expand Down
Loading