Skip to content

Commit 41d7933

Browse files
adding VERSION to make xpkg.publish targets
1 parent f7d2ac1 commit 41d7933

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/release-candidate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ jobs:
6565
run: |
6666
make xpkg.build PLATFORM=linux_amd64 VERSION=${{ steps.version.outputs.version }}
6767
make xpkg.build PLATFORM=linux_arm64 VERSION=${{ steps.version.outputs.version }}
68-
make xpkg.release.publish
68+
make xpkg.release.publish VERSION=${{ steps.version.outputs.version }}

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
run: |
110110
make xpkg.build PLATFORM=linux_amd64 VERSION=${{ steps.version.outputs.version }} BRANCH_NAME=${GITHUB_REF##*/}
111111
make xpkg.build PLATFORM=linux_arm64 VERSION=${{ steps.version.outputs.version }} BRANCH_NAME=${GITHUB_REF##*/}
112-
make xpkg.release.publish
112+
make xpkg.release.publish VERSION=${{ steps.version.outputs.version }}
113113
114114
- name: Run GoReleaser
115115
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,12 @@ GO111MODULE = on
4040
GOLANGCILINT_VERSION ?= 1.64.5
4141
-include build/makelib/golang.mk
4242

43+
# kind-related versions
44+
KIND_VERSION ?= v0.26.0
45+
KIND_NODE_IMAGE_TAG ?= v1.32.0
46+
4347
# Setup Kubernetes tools
44-
KIND_VERSION = v0.22.0
48+
4549
UP_VERSION = v0.31.0
4650
UP_CHANNEL = stable
4751
UPTEST_VERSION = v0.11.1
@@ -53,7 +57,6 @@ IMAGES = provider-cloudfoundry
5357
-include build/makelib/imagelight.mk
5458

5559

56-
5760
# Import upgrade test environment variables from shell
5861
export UPGRADE_TEST_FROM_TAG
5962
export UPGRADE_TEST_TO_TAG
@@ -63,6 +66,8 @@ export CF_EMAIL
6366
export CF_USERNAME
6467
export CF_PASSWORD
6568
export CF_ENDPOINT
69+
70+
6671
# NOTE(hasheddan): we ensure up is installed prior to running platform-specific
6772
# build steps in parallel to avoid encountering an installation race condition.
6873
build.init: $(UP)
@@ -181,8 +186,6 @@ test-acceptance: local-deploy $(KUBECTL)
181186
@$(KUBECTL) create namespace crossplane-system
182187
@$(INFO) running integration tests
183188
@$(INFO) Skipping long running tests
184-
@$(INFO) ${E2E_IMAGES}
185-
@echo "E2E_IMAGES=$$E2E_IMAGES"
186189
go test -v $(PROJECT_REPO)/test/e2e -tags=e2e -short -count=1 -test.v -timeout=15m -run '$(testFilter)' 2>&1 | tee test-output.log
187190
@echo "===========Test Summary==========="
188191
@grep -E "PASS|FAIL" test-output.log

0 commit comments

Comments
 (0)