Skip to content

Commit

Permalink
Merge pull request #2067 from ChristianAvila/update-build-versions
Browse files Browse the repository at this point in the history
chores: Update build submodule and up up cli version
  • Loading branch information
MisterMX authored Jul 24, 2024
2 parents d17c9da + 8fa522d commit 5eb25dc
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
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
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
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
4 changes: 2 additions & 2 deletions cluster/local/integration_tests.sh
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

0 comments on commit 5eb25dc

Please sign in to comment.